diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_Client_text_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_Client_text_ko.png index da563ea6..58d8d0cb 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_Client_text_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_Client_text_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_White_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_White_ko.png index f58976be..392298b3 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_White_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_White_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_ko.png index 35834d68..e7127cab 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_ko.png index 41d58d3d..f5eeb76c 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_cancel_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_cancel_ko.png index 0f4f844f..6359e169 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_cancel_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_cancel_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_text_AchievementReward_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_text_AchievementReward_ko.png index dc24eae6..166e64c6 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_text_AchievementReward_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_text_AchievementReward_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_text_GreatSccessBonus_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_text_GreatSccessBonus_ko.png index 0f341fd2..5892eb52 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_text_GreatSccessBonus_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_Main_BulkOrder_text_GreatSccessBonus_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_Cooked_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_Cooked_logo_ko.png index d02c58d3..60ac9ac6 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_Cooked_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_Cooked_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_DoNot_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_DoNot_logo_ko.png index 5b086e12..2b25fa42 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_DoNot_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_DoNot_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_cancel_logo_a_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_cancel_logo_a_ko.png index eb4a6bcf..aaaf9967 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_cancel_logo_a_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_cancel_logo_a_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_cancel_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_cancel_logo_ko.png index d478a0f0..dc78bd85 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_cancel_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_cancel_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_delivery_logo_gray_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_delivery_logo_gray_ko.png index 13d727f3..c8b913f5 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_delivery_logo_gray_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_delivery_logo_gray_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_delivery_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_delivery_logo_ko.png index ebc2c970..adac2f11 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_delivery_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_delivery_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_ok_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_ok_logo_ko.png index ad11d598..e9803fb7 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_ok_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/BulkOrder/ui_button_icon_ok_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity_ko.png index 8fcb4c0b..0f07bb90 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_detail_pop_FlameCaution_title_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_detail_pop_FlameCaution_title_ko.png index cce9e632..192d4fa1 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_detail_pop_FlameCaution_title_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_detail_pop_FlameCaution_title_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_title_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_title_ko.png index d14c1f1b..bdb61f3d 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_title_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_Main_recipe_title_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_close_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_close_logo_ko.png index dc1dcc41..48f4ab6f 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_close_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_close_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_make_logo_gray_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_make_logo_gray_ko.png index 1c9d0d9a..c5806300 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_make_logo_gray_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_make_logo_gray_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_make_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_make_logo_ko.png index 767f5afa..0820e3b0 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_make_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_make_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_stop_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_stop_logo_ko.png index aad2f04b..46c14edd 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_stop_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/recipe/ui_button_icon_stop_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_SpeechBalloon_order_receive_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_SpeechBalloon_order_receive_ko.png index 043c0a77..308b7f49 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_SpeechBalloon_order_receive_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_SpeechBalloon_order_receive_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_FryingPan_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_FryingPan_logo_ko.png index 8d040fbf..21523624 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_FryingPan_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_FryingPan_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_ProductManagement_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_ProductManagement_logo_ko.png index 4ddca046..f70b49ed 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_ProductManagement_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_ProductManagement_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_Purchasing_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_Purchasing_logo_ko.png index 37dcc433..32327b6d 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_Purchasing_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_Purchasing_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_corn_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_corn_logo_ko.png index ca8ef307..a59c6bd3 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_corn_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_corn_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_shop_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_shop_logo_ko.png index 195af93c..9e7619f0 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_shop_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_shop_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/cooking/result/ui_button_icon_destruction_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/cooking/result/ui_button_icon_destruction_logo_ko.png index 406f3606..476d1124 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/cooking/result/ui_button_icon_destruction_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/cooking/result/ui_button_icon_destruction_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_button_icon_make_one_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_button_icon_make_one_logo_ko.png index e3e3cdf8..43466148 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_button_icon_make_one_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_button_icon_make_one_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_button_icon_stop_big_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_button_icon_stop_big_logo_ko.png index 347570d2..701ae445 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_button_icon_stop_big_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_button_icon_stop_big_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_cooking_explanation_text_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_cooking_explanation_text_ko.png index f448fc5e..10b5d73e 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_cooking_explanation_text_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/cooking/ui_cooking_explanation_text_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare_text_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare_text_ko.png index 621ed19d..7941ac20 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare_text_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare_text_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a_ko.png index e1a826f3..dcc6028d 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b_ko.png index c49d2eaf..b5901435 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b_ko.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity index d4ae1a76..e1f94303 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity @@ -203,6 +203,30 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 751013265800446227, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9619dc1bf909abb46aee1a87360265d0, + type: 3} + - target: {fileID: 751013266033158939, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9619dc1bf909abb46aee1a87360265d0, + type: 3} + - target: {fileID: 751013266328303293, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 753bdf739fc2679418f8064422e3c449, + type: 3} + - target: {fileID: 751013266565487797, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 753bdf739fc2679418f8064422e3c449, + type: 3} - target: {fileID: 2491106385478250891, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_AnchorMax.y @@ -296,6 +320,12 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4082915278450758382, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 753bdf739fc2679418f8064422e3c449, + type: 3} - target: {fileID: 4082915278942985864, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_AnchorMax.y @@ -322,6 +352,12 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} + - target: {fileID: 4082915279096188744, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9619dc1bf909abb46aee1a87360265d0, + type: 3} - target: {fileID: 4082915279112502089, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity index 01fa9568..0bcea226 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity @@ -208,6 +208,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2377818823168895751, guid: 5a98de00194aa40f6a3050df19f4e5f5, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f3378cb6a2562d8498886f93b8fcc817, + type: 3} - target: {fileID: 2377818823490934338, guid: 5a98de00194aa40f6a3050df19f4e5f5, type: 3} propertyPath: m_Pivot.x @@ -328,5 +334,29 @@ PrefabInstance: propertyPath: m_Name value: Canvas objectReference: {fileID: 0} + - target: {fileID: 2377818823724858329, guid: 5a98de00194aa40f6a3050df19f4e5f5, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, + type: 3} + - target: {fileID: 2377818824163143826, guid: 5a98de00194aa40f6a3050df19f4e5f5, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 09da070ea3021c5428ccc8b6faaaedf3, + type: 3} + - target: {fileID: 2377818824174324135, guid: 5a98de00194aa40f6a3050df19f4e5f5, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: dc2aaee634e57eb4898f671d9d280316, + type: 3} + - target: {fileID: 2377818824328388905, guid: 5a98de00194aa40f6a3050df19f4e5f5, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5a98de00194aa40f6a3050df19f4e5f5, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity index 39d1e718..8d301fa8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity @@ -207,7 +207,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, type: 3} - target: {fileID: 3058138224889858367, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} @@ -253,19 +253,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, type: 3} - target: {fileID: 4315754686575543077, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 30db09479dbd54cf0b008136e816acd7, + objectReference: {fileID: 21300000, guid: 09da070ea3021c5428ccc8b6faaaedf3, type: 3} - target: {fileID: 4315754686625492741, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, + objectReference: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, type: 3} - target: {fileID: 4315754687099534943, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} @@ -396,7 +396,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c6f198817e0e9474facf0c1a36b1baf6, + objectReference: {fileID: 21300000, guid: 185361e852912d246a6e8c831df32ecb, type: 3} - target: {fileID: 4315754688526726639, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} @@ -422,7 +422,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, + objectReference: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1725d421d10a4e348ad0cf68ac29f68, 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 0b340a84..37e0aa8f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -35,7 +35,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: 117} + m_SizeDelta: {x: 300, y: 117} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3717552158352820819 GameObject: @@ -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: 120} + m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8166373738923674638 CanvasRenderer: @@ -177,7 +177,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3427e8ca8d0104e48931345970086635, type: 3} + m_Sprite: {fileID: 21300000, guid: 9b141242e54041f4f934eb9f6f9bb784, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -407,7 +407,7 @@ RectTransform: m_GameObject: {fileID: 4082915277796665067} 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.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 4082915279019759820} m_RootOrder: 0 @@ -444,7 +444,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 274b9e3453e45cb42952f9bf572e625b, type: 3} + m_Sprite: {fileID: 21300000, guid: 36b3da98ccacddc4abe8e0b1df6392ea, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -747,7 +747,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -827,7 +827,7 @@ RectTransform: m_GameObject: {fileID: 4082915278008547938} 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.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 4082915278864071265} m_RootOrder: 2 @@ -864,9 +864,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} + m_Sprite: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -998,7 +998,7 @@ RectTransform: m_GameObject: {fileID: 4082915278124182475} 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.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 4082915278942985864} m_RootOrder: 0 @@ -1035,7 +1035,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2517cc429555fe24b8c0cc353d0c02f9, type: 3} + m_Sprite: {fileID: 21300000, guid: 36bdc31523f6bc246ad7c3622d376a25, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1292,12 +1292,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 30 m_Right: 0 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 150 + m_Spacing: 100 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -1606,7 +1606,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: 120} + m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915278942985869 CanvasRenderer: @@ -1878,7 +1878,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: 120} + m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915279019759809 CanvasRenderer: @@ -2041,7 +2041,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} + m_Sprite: {fileID: 21300000, guid: 09da070ea3021c5428ccc8b6faaaedf3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2234,7 +2234,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2767,7 +2767,7 @@ RectTransform: m_GameObject: {fileID: 6202160122166083923} 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.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 2281569350741980153} m_RootOrder: 0 @@ -2939,8 +2939,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + objectReference: {fileID: 21300000, guid: ea63a6fefdfeed7458fa482330a7228a, type: 3} + - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3658417434568161586, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_IsActive @@ -2955,13 +2960,13 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3109,19 +3114,24 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + objectReference: {fileID: 21300000, guid: ea63a6fefdfeed7458fa482330a7228a, type: 3} + - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6701890202664346918, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3238,6 +3248,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7678205219272013582, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_SizeDelta.x + value: 152 + objectReference: {fileID: 0} + - target: {fileID: 7678205219272013582, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_LocalScale.x + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 7678205219272013582, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_LocalScale.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 7678205219272013582, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_LocalScale.z + value: 1.1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} --- !u!114 &6685489803199069635 stripped @@ -3269,19 +3299,24 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + objectReference: {fileID: 21300000, guid: ea63a6fefdfeed7458fa482330a7228a, type: 3} + - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6701890202664346918, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3393,6 +3428,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7678205219272013582, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_SizeDelta.x + value: 152 + objectReference: {fileID: 0} + - target: {fileID: 7678205219272013582, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_LocalScale.x + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 7678205219272013582, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_LocalScale.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 7678205219272013582, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_LocalScale.z + value: 1.1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} --- !u!114 &6685489803297445835 stripped diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index a48aa9ad..e1248df8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -370,7 +370,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6009169cf4bae0f44a76a4d631861685, type: 3} + m_Sprite: {fileID: 21300000, guid: f3378cb6a2562d8498886f93b8fcc817, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -874,7 +874,7 @@ RectTransform: m_GameObject: {fileID: 2377818823724858331} 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: 2377818823238410851} m_RootOrder: 0 @@ -911,9 +911,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1027,7 +1027,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -1485,16 +1485,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2377818824163143828} - 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.1, y: 1.1, z: 1.1} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 2377818824381547236} m_RootOrder: 2 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: -175, y: 62} + m_AnchoredPosition: {x: -175, y: 62.00006} m_SizeDelta: {x: 82, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818824163143827 @@ -1524,9 +1524,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} + m_Sprite: {fileID: 21300000, guid: 09da070ea3021c5428ccc8b6faaaedf3, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1602,7 +1602,7 @@ 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.1, y: 1.1, z: 1.1} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 2377818824244898183} m_RootOrder: 3 @@ -1639,9 +1639,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6c7a1316274f767489221ac9165a0148, type: 3} + m_Sprite: {fileID: 21300000, guid: dc2aaee634e57eb4898f671d9d280316, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1922,7 +1922,7 @@ 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.1, y: 1.1, z: 1.1} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 2377818824244898183} m_RootOrder: 0 @@ -1959,9 +1959,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} + m_Sprite: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab index c2673559..1f97962e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab @@ -402,8 +402,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: 140, y: 125.10004} - m_SizeDelta: {x: 240, y: 110} + m_AnchoredPosition: {x: 127, y: 125.10004} + m_SizeDelta: {x: 320, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074209150459481 CanvasRenderer: @@ -806,7 +806,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: -159, y: 125.1} + m_AnchoredPosition: {x: -186, y: 125.1} m_SizeDelta: {x: 196, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074209291994454 @@ -1010,7 +1010,7 @@ RectTransform: m_GameObject: {fileID: 4187074209478010266} 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.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 4187074209291994453} m_RootOrder: 0 @@ -1203,7 +1203,7 @@ RectTransform: m_GameObject: {fileID: 4187074209620482713} 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.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 4187074209150459460} m_RootOrder: 0 @@ -1559,7 +1559,7 @@ RectTransform: m_GameObject: {fileID: 4187074210099131615} 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.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 4187074209382484540} m_RootOrder: 0 @@ -1598,7 +1598,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index 959f11e7..9b895a28 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -80,14 +80,14 @@ RectTransform: m_GameObject: {fileID: 4315754686575543079} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 4315754687733902321} m_RootOrder: 2 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: -141, y: 49} + m_AnchoredPosition: {x: -141, y: 57} m_SizeDelta: {x: 82, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754686575543082 @@ -117,9 +117,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} + m_Sprite: {fileID: 21300000, guid: 09da070ea3021c5428ccc8b6faaaedf3, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -273,14 +273,14 @@ RectTransform: m_GameObject: {fileID: 4315754686625492743} 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.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 4315754687736309292} m_RootOrder: 0 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} + m_AnchoredPosition: {x: 107, y: -76} m_SizeDelta: {x: 130, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754686625492746 @@ -310,9 +310,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} + m_Sprite: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -646,7 +646,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: -38, y: 2.000026} + m_AnchoredPosition: {x: -31, y: 2.000026} m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687482315027 @@ -826,7 +826,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -1449,7 +1449,7 @@ RectTransform: m_GameObject: {fileID: 4315754688123097768} 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.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 4315754686536851282} m_RootOrder: 0 @@ -1486,7 +1486,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 48243d820b7c5bd43ba50a88f69a8c05, type: 3} + m_Sprite: {fileID: 21300000, guid: 185361e852912d246a6e8c831df32ecb, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1572,7 +1572,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: 192.6, y: 2.000026} + m_AnchoredPosition: {x: 210, y: 2.000026} m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688138076305 @@ -1845,7 +1845,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2043,7 +2043,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, type: 3} - target: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} @@ -2159,7 +2159,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} @@ -2339,7 +2339,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, type: 3} - target: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} @@ -2455,7 +2455,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index 01790a03..c5b31fed 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -553,7 +553,7 @@ RectTransform: m_GameObject: {fileID: 3658417434518209424} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.85, y: 0.85, z: 0.85} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3658417434568161581} m_RootOrder: 0 @@ -590,9 +590,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6c7a1316274f767489221ac9165a0148, type: 3} + m_Sprite: {fileID: 21300000, guid: dc2aaee634e57eb4898f671d9d280316, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -843,9 +843,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 016a4d1058a82e64899a7e1776a6a3e3, type: 3} + m_Sprite: {fileID: 21300000, guid: 47bebb06d82ad4b458a7a82082cec799, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1035,7 +1035,7 @@ RectTransform: m_GameObject: {fileID: 3658417435668626830} 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: 3658417434522814401} m_RootOrder: 0 @@ -1072,9 +1072,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 35f44428c7e9fd74eae90f656268d858, type: 3} + m_Sprite: {fileID: 21300000, guid: 753bdf739fc2679418f8064422e3c449, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1150,7 +1150,7 @@ RectTransform: m_GameObject: {fileID: 3658417436044435500} 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: 3658417434859902284} m_RootOrder: 0 @@ -1187,9 +1187,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cfb90a2d77f52f8449f001ae3c506486, type: 3} + m_Sprite: {fileID: 21300000, guid: 9619dc1bf909abb46aee1a87360265d0, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1414,7 +1414,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_FontSize: 30 m_FontStyle: 1 m_BestFit: 0 @@ -1646,7 +1646,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} + m_Sprite: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1901,7 +1901,7 @@ RectTransform: m_GameObject: {fileID: 7069106111209747888} 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: 6151904071976189485} m_RootOrder: 0 @@ -1909,7 +1909,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: 120, y: 40} + m_SizeDelta: {x: 152, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8753549073578196651 CanvasRenderer: @@ -1938,9 +1938,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, type: 3} + m_Sprite: {fileID: 21300000, guid: ea63a6fefdfeed7458fa482330a7228a, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index b3c824a9..a14adfed 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -784,7 +784,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -255, y: 79.89997} - m_SizeDelta: {x: 92, y: 38} + m_SizeDelta: {x: 120, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875109116653 CanvasRenderer: