diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_ko.png index e1b71632..fc1cda7e 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_ko.png index f210411f..f6972290 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_ko.png index a239d90d..5ed7b046 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_button_icon_empty_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_button_icon_empty_logo_ko.png index d83c243e..6b24f0f6 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_button_icon_empty_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_button_icon_empty_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_button_icon_receive_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_button_icon_receive_logo_ko.png index e1232f52..f60ea348 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_button_icon_receive_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/AutomaticCooking/ui_button_icon_receive_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Settings/ui_Settings_button_icon_explanation_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Settings/ui_Settings_button_icon_explanation_logo_ko.png index 647acd4c..f6f75d37 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Settings/ui_Settings_button_icon_explanation_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Settings/ui_Settings_button_icon_explanation_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/ui_button_icon_no_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/ui_button_icon_no_logo_ko.png index 4276367e..574b023a 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/ui_button_icon_no_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/ui_button_icon_no_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/ui_button_icon_yes_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/ui_button_icon_yes_logo_ko.png index 4446965d..b8747962 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/ui_button_icon_yes_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/ui_button_icon_yes_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 476d1124..acb0c364 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/result/ui_button_icon_ok_logo_big_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/cooking/result/ui_button_icon_ok_logo_big_ko.png index c9003390..a5f699a7 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/cooking/result/ui_button_icon_ok_logo_big_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/cooking/result/ui_button_icon_ok_logo_big_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 43466148..c446e8ab 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/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index c3afba58..c4b29f5e 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -268,6 +268,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 283934329} m_CullTransparentMesh: 0 +--- !u!114 &297523931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1459407280} --- !u!1 &322038869 GameObject: m_ObjectHideFlags: 0 @@ -486,7 +499,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 171ed0d11d66f6a4d8c147aa7cd31fde, type: 3} + m_Sprite: {fileID: 21300000, guid: 02e04b8bfb9f3064ea2a0142ec5fd52e, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1470,19 +1483,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 207} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &832956694 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1459407280} --- !u!1 &885194169 GameObject: m_ObjectHideFlags: 0 @@ -1511,7 +1511,7 @@ RectTransform: m_GameObject: {fileID: 885194169} 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: 1887559734} m_RootOrder: 0 @@ -1519,7 +1519,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 60, y: 7} - m_SizeDelta: {x: 232, y: 50} + m_SizeDelta: {x: 278, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &885194171 MonoBehaviour: @@ -1540,7 +1540,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2dbe939557752344e969c5bf274bae45, type: 3} + m_Sprite: {fileID: 21300000, guid: 2109c4113b49a4c45aa0f5e13ab89297, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1655,7 +1655,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 38cf1e5c19dbdd14a8c194b063a29e85, type: 3} + m_Sprite: {fileID: 21300000, guid: baa9205a086494c45ac2b0d88fe571b8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2797,7 +2797,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: 232, y: 50} + m_SizeDelta: {x: 236, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1330096121 MonoBehaviour: @@ -2818,7 +2818,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a87a9337eaa8d394ab3e9f2a130777ee, type: 3} + m_Sprite: {fileID: 21300000, guid: 0e8ca5d9c840ba042b6ee05b94f22031, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -8330,7 +8330,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: 35 m_FontStyle: 1 m_BestFit: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index c6fad863..1025dfa1 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab @@ -1994,7 +1994,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, type: 3} + m_Sprite: {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2378,7 +2378,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -2798,7 +2798,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -2915,7 +2915,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 52102f2f72a27fb40bb5d27bf309f6d1, type: 3} + m_Sprite: {fileID: 21300000, guid: 4cfc30a3bf61af2468eff2d37a9e1b5e, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab index 4514b92b..e2e6b021 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab @@ -587,7 +587,7 @@ RectTransform: m_GameObject: {fileID: 2616693359959091458} 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: 2616693360873139560} m_RootOrder: 0 @@ -949,7 +949,7 @@ RectTransform: m_GameObject: {fileID: 2616693360776471844} 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: 2616693359888773712} m_RootOrder: 0 @@ -1571,7 +1571,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9056227429215986452 RectTransform: m_ObjectHideFlags: 0 @@ -1772,7 +1772,7 @@ RectTransform: m_GameObject: {fileID: 7136467892795250601} 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: 6033582325411655682} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index 8a5f191f..0698274a 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -121,19 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &48596641 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 2616693359400416744} --- !u!1 &90350694 GameObject: m_ObjectHideFlags: 0 @@ -191,7 +178,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4c5f4520889b1ea42ad6bf74b0e96c30, type: 3} + m_Sprite: {fileID: 21300000, guid: 0446a6dcc49bc9f4697d60ca28b559d0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -249,19 +236,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 670145871} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &181105024 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 2616693359400416746} --- !u!114 &250939657 MonoBehaviour: m_ObjectHideFlags: 0 @@ -285,14 +259,13 @@ PrefabInstance: - target: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_Text - value: "1\uADF8\uB8E8\uC5D0\uC11C 3\uC774\uC0AD\uC744 \uC218\uD655\uD560 \uC218 - \uC788\uC2B5\uB2C8\uB2E4." + value: "1\u682A\u304B\u30893\u672C\u53CE\u7A6B\u3067\u304D\u307E\u3059" objectReference: {fileID: 0} - target: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 2746775699208038261, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -303,7 +276,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0e7856286a3221944ad85eb3ad09c93b, + objectReference: {fileID: 21300000, guid: 219e2813d99bd6746abadbbb1ca5efba, type: 3} - target: {fileID: 8736114270187051288, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -454,7 +427,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 52102f2f72a27fb40bb5d27bf309f6d1, + objectReference: {fileID: 21300000, guid: 4cfc30a3bf61af2468eff2d37a9e1b5e, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -486,14 +459,13 @@ PrefabInstance: - target: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_Text - value: "1\uADF8\uB8E8\uC5D0\uC11C 3\uC774\uC0AD\uC744 \uC218\uD655\uD560 \uC218 - \uC788\uC2B5\uB2C8\uB2E4." + value: "1\u682A\u304B\u30893\u672C\u53CE\u7A6B\u3067\u304D\u307E\u3059" objectReference: {fileID: 0} - target: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 2746775699208038261, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -504,7 +476,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0e7856286a3221944ad85eb3ad09c93b, + objectReference: {fileID: 21300000, guid: 219e2813d99bd6746abadbbb1ca5efba, type: 3} - target: {fileID: 8736114270187051288, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -630,7 +602,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, + objectReference: {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} - target: {fileID: 8736114271410563866, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -896,19 +868,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &780928393 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 2616693359400416747} --- !u!1 &884928057 GameObject: m_ObjectHideFlags: 0 @@ -1145,7 +1104,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1420,19 +1379,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2024137685 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 2616693359400416745} --- !u!1 &2144327473 GameObject: m_ObjectHideFlags: 0 @@ -1549,13 +1495,13 @@ PrefabInstance: - target: {fileID: 2616693359242844618, guid: 8990d570a96764364823ea362803dfcf, type: 3} propertyPath: m_Text - value: "\uAC00\uACF5\uBA38\uC2E0" + value: "\u52A0\u5DE5\u30DE\u30B7\u30FC\u30F3\n" objectReference: {fileID: 0} - target: {fileID: 2616693359242844618, guid: 8990d570a96764364823ea362803dfcf, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 2616693360086915590, guid: 8990d570a96764364823ea362803dfcf, type: 3} @@ -1671,13 +1617,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, + objectReference: {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} - target: {fileID: 5553657216358781386, guid: 8990d570a96764364823ea362803dfcf, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 35bd62be821f70647a2142fec78e7fd3, + objectReference: {fileID: 21300000, guid: abd93eb864d1792489e26436c0253f91, type: 3} - target: {fileID: 5634060817564804317, guid: 8990d570a96764364823ea362803dfcf, type: 3} @@ -1688,7 +1634,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 35bd62be821f70647a2142fec78e7fd3, + objectReference: {fileID: 21300000, guid: abd93eb864d1792489e26436c0253f91, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8990d570a96764364823ea362803dfcf, type: 3} @@ -1704,54 +1650,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6e1d854606044948a8c4f506b9438ee8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2616693359400416744 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2616693359242844618, guid: 8990d570a96764364823ea362803dfcf, - type: 3} - m_PrefabInstance: {fileID: 2616693359400416742} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2616693359400416745 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5553657216358781386, guid: 8990d570a96764364823ea362803dfcf, - type: 3} - m_PrefabInstance: {fileID: 2616693359400416742} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2616693359400416746 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6461896231797963539, guid: 8990d570a96764364823ea362803dfcf, - type: 3} - m_PrefabInstance: {fileID: 2616693359400416742} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2616693359400416747 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2616693360776471842, guid: 8990d570a96764364823ea362803dfcf, - type: 3} - m_PrefabInstance: {fileID: 2616693359400416742} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &8736114270285166811 PrefabInstance: m_ObjectHideFlags: 0 @@ -1762,14 +1660,13 @@ PrefabInstance: - target: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_Text - value: "1\uADF8\uB8E8\uC5D0\uC11C 3\uC774\uC0AD\uC744 \uC218\uD655\uD560 \uC218 - \uC788\uC2B5\uB2C8\uB2E4." + value: "1\u682A\u304B\u30893\u672C\u53CE\u7A6B\u3067\u304D\u307E\u3059" objectReference: {fileID: 0} - target: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 3975643701173361712, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -1785,7 +1682,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0e7856286a3221944ad85eb3ad09c93b, + objectReference: {fileID: 21300000, guid: 219e2813d99bd6746abadbbb1ca5efba, type: 3} - target: {fileID: 6796275775689852962, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -1921,7 +1818,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, + objectReference: {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} - target: {fileID: 8736114271410563866, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -1952,7 +1849,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 52102f2f72a27fb40bb5d27bf309f6d1, + objectReference: {fileID: 21300000, guid: 4cfc30a3bf61af2468eff2d37a9e1b5e, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index 0e2fc5ae..2b895e0f 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -231,6 +231,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 239476807} m_CullTransparentMesh: 0 +--- !u!114 &253984197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1766466141} --- !u!1 &308891212 GameObject: m_ObjectHideFlags: 0 @@ -305,19 +318,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 308891212} m_CullTransparentMesh: 0 ---- !u!114 &309332070 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1402887490} --- !u!114 &442970493 MonoBehaviour: m_ObjectHideFlags: 0 @@ -524,7 +524,7 @@ RectTransform: m_GameObject: {fileID: 575026009} 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: 1192264082} m_RootOrder: 0 @@ -553,7 +553,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, type: 3} + m_Sprite: {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1008,7 +1008,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 140, y: -226.89993} - m_SizeDelta: {x: 240, y: 110} + m_SizeDelta: {x: 250, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &865761136 MonoBehaviour: @@ -1284,7 +1284,7 @@ RectTransform: m_GameObject: {fileID: 1020149465} 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: 865761135} m_RootOrder: 0 @@ -1313,7 +1313,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 52102f2f72a27fb40bb5d27bf309f6d1, type: 3} + m_Sprite: {fileID: 21300000, guid: 4cfc30a3bf61af2468eff2d37a9e1b5e, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1553,7 +1553,7 @@ RectTransform: m_GameObject: {fileID: 1122617362} 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: 1130921225} m_RootOrder: 0 @@ -1582,7 +1582,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8b7783b0e5a9b454db7fd811119f046e, type: 3} + m_Sprite: {fileID: 21300000, guid: de598de8a3393044686c7ef88b193396, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1640,19 +1640,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 1235739389} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &1127974415 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1766466141} --- !u!1 &1130921224 GameObject: m_ObjectHideFlags: 0 @@ -1691,7 +1678,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -159, y: -226.89996} - m_SizeDelta: {x: 196, y: 110} + m_SizeDelta: {x: 206, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1130921226 MonoBehaviour: @@ -1905,7 +1892,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 140, y: -226.89993} - m_SizeDelta: {x: 240, y: 110} + m_SizeDelta: {x: 250, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1192264083 MonoBehaviour: @@ -2180,7 +2167,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 35bd62be821f70647a2142fec78e7fd3, + objectReference: {fileID: 21300000, guid: abd93eb864d1792489e26436c0253f91, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} @@ -2871,7 +2858,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 35bd62be821f70647a2142fec78e7fd3, + objectReference: {fileID: 21300000, guid: abd93eb864d1792489e26436c0253f91, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} @@ -3025,6 +3012,19 @@ RectTransform: m_AnchoredPosition: {x: -7, y: 166.19997} m_SizeDelta: {x: 550, y: 300} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1949582597 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1402887490} --- !u!1 &1977897796 GameObject: m_ObjectHideFlags: 0 @@ -3083,7 +3083,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity index b65dc5db..9e346cdf 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity @@ -660,7 +660,7 @@ RectTransform: m_GameObject: {fileID: 1707876980489548926} 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: 1707876980958523555} m_RootOrder: 0 @@ -1598,7 +1598,7 @@ RectTransform: m_GameObject: {fileID: 1707876981437582205} 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: 1707876981116840882} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity index f365b031..e3edbbe4 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity @@ -661,7 +661,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: 1 m_FillCenter: 1 @@ -747,7 +747,7 @@ RectTransform: m_GameObject: {fileID: 377458891} 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: 1240257559} m_RootOrder: 0 @@ -776,7 +776,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7b9f4b6377671b5479597672719d19bc, type: 3} + m_Sprite: {fileID: 21300000, guid: e1aa8b6ea993e3d489dcd6308d0cf5d8, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1188,7 +1188,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a4ae18b6aed1eb94dbbc5664789c4c8a, type: 3} + m_Sprite: {fileID: 21300000, guid: 062e7df722b12514eb866309eefb1088, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3696,7 +3696,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8bf552a8c07aeb947ba7ea13f68e9e63, type: 3} + m_Sprite: {fileID: 21300000, guid: 5692e43e5368ba84cadd4e46a2936f40, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity index d274e9b5..c25856ae 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity @@ -552,7 +552,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -564,7 +564,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u7372\u5F97\u307E\u3067\u306E\u6642\u9593" + m_Text: "\uD68D\uB4DD\uAE4C\uC9C0 \uD544\uC694\uD55C \uC2DC\uAC04" --- !u!222 &445717701 CanvasRenderer: m_ObjectHideFlags: 0 @@ -803,7 +803,7 @@ RectTransform: m_GameObject: {fileID: 593536990} 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: 1177471511} m_RootOrder: 0 @@ -872,7 +872,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: de598de8a3393044686c7ef88b193396, type: 3} + m_Sprite: {fileID: 21300000, guid: 8b7783b0e5a9b454db7fd811119f046e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1473,7 +1473,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -1485,7 +1485,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u7372\u5F97\u3067\u304D\u308B\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" + m_Text: "\uD68D\uB4DD\uD560 \uC218 \uC788\uB294 \uD31D\uCF58" --- !u!222 &1165270083 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1572,7 +1572,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -159, y: 114.00003} - m_SizeDelta: {x: 196, y: 110} + m_SizeDelta: {x: 206, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1177471512 MonoBehaviour: @@ -2407,7 +2407,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: 35 m_FontStyle: 0 m_BestFit: 0 @@ -2419,7 +2419,10 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.2 - m_Text: "\u81EA\u52D5\u8ABF\u7406\u3092\u4F7F\u3046\u3068\u4E00\u5B9A\u6642\u9593\u5F8C\u306B\n\u5927\u91CF\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u7372\u5F97\u3067\u304D\u307E\u3059\uFF01\n\u52D5\u753B\u3092\u898B\u3066\u81EA\u52D5\u8ABF\u7406\u3092\u4F7F\u3044\u307E\u3059\u304B\uFF1F" + m_Text: "\uC790\uB3D9 \uC870\uB9AC\uB97C \uC0AC\uC6A9\uD558\uBA74 \uC77C\uC815 + \uC2DC\uAC04 \uD6C4\uC5D0\n\uB300\uB7C9\uC758 \uD31D\uCF58\uC744 \uD68D\uB4DD\uD560 + \uC218 \uC788\uC2B5\uB2C8\uB2E4!\n\uAD11\uACE0\uB97C \uBCF4\uACE0 \uC790\uB3D9 + \uC870\uB9AC\uB97C \uC0AC\uC6A9\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? " --- !u!222 &1633334325 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2675,7 +2678,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2687,7 +2690,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u306B\u5FC5\u8981\u306A\u4F7F\u7528\u56DE\u6570" + m_Text: "\uB808\uBCA8\uC5C5\uC5D0 \uD544\uC694\uD55C \uC0AC\uC6A9 \uD69F\uC218" --- !u!222 &1667839401 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2839,7 +2842,7 @@ RectTransform: m_GameObject: {fileID: 1711803837} 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: 1725004922} m_RootOrder: 0 @@ -2908,7 +2911,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 490f9ea68882b7b48bcc2974a41f8bcd, type: 3} + m_Sprite: {fileID: 21300000, guid: be4dab1f6c324984cb0659ce0cc2b7c7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2964,7 +2967,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 140, y: 114} - m_SizeDelta: {x: 240, y: 110} + m_SizeDelta: {x: 250, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1725004923 MonoBehaviour: @@ -3159,7 +3162,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -3171,7 +3174,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u81EA\u52D5\u8ABF\u7406\u30EC\u30D9\u30EB" + m_Text: "\uC790\uB3D9 \uC870\uB9AC \uB808\uBCA8" --- !u!222 &1771385234 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index 836e86f4..b3ee0505 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity @@ -159,7 +159,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -159, y: 61} - m_SizeDelta: {x: 196, y: 110} + m_SizeDelta: {x: 206, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4540746 MonoBehaviour: @@ -544,7 +544,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 140, y: 61} - m_SizeDelta: {x: 240, y: 110} + m_SizeDelta: {x: 250, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &208413211 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity index 4dd3a5e4..f359eef1 100644 --- a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity +++ b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity @@ -2504,7 +2504,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: -14} - m_SizeDelta: {x: 250, y: 98} + m_SizeDelta: {x: 250, y: 108} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1344990811 MonoBehaviour: @@ -3014,7 +3014,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 69} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 206, y: 108} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1680775601 MonoBehaviour: @@ -3515,7 +3515,7 @@ RectTransform: m_GameObject: {fileID: 1894598661} 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: 1680775600} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index a14adfed..f618a97b 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -1482,7 +1482,7 @@ RectTransform: m_GameObject: {fileID: 3856012875620007270} 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: 3856012876379087770} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab index e7af397e..23a4a3a9 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab @@ -556,7 +556,7 @@ RectTransform: m_GameObject: {fileID: 2025492179711668415} 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: 3134383896517508605} m_RootOrder: 1 @@ -1733,7 +1733,7 @@ RectTransform: m_GameObject: {fileID: 9169750603911259639} 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: 5432270798510394095} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab index f05d5162..ba413df9 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab @@ -11461,7 +11461,7 @@ RectTransform: m_GameObject: {fileID: 8660695105894842729} 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: 8660695104385436399} m_RootOrder: 0 @@ -11500,7 +11500,7 @@ MonoBehaviour: m_Calls: [] 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 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab index 30a01947..bd10b016 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab @@ -558,7 +558,7 @@ RectTransform: m_GameObject: {fileID: 5089467466529880977} 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: 5089467466155668368} m_RootOrder: 0 @@ -1230,7 +1230,7 @@ RectTransform: m_GameObject: {fileID: 5089467467555811513} 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: 5089467467567286955} m_RootOrder: 0 @@ -1905,7 +1905,7 @@ RectTransform: m_GameObject: {fileID: 5089467468128331487} 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.11, z: 1.1} m_Children: [] m_Father: {fileID: 5089467466492122905} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index a8d7b0a9..2fb86c43 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -121,6 +121,32 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &32526828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2701980939299648213} +--- !u!114 &43826616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2701980939299648206} --- !u!1 &189791791 GameObject: m_ObjectHideFlags: 0 @@ -213,7 +239,7 @@ PrefabInstance: - target: {fileID: 315354246554936540, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 8 + value: 12 objectReference: {fileID: 0} - target: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -329,7 +355,7 @@ PrefabInstance: - target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 9 + value: 13 objectReference: {fileID: 0} - target: {fileID: 2835369144934501534, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -573,12 +599,12 @@ PrefabInstance: - target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4037191023444158820, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 11 + value: 14 objectReference: {fileID: 0} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -588,7 +614,7 @@ PrefabInstance: - target: {fileID: 5047569869407099398, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 12 + value: 10 objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -608,7 +634,7 @@ PrefabInstance: - target: {fileID: 7715340749758393301, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 13 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7758062554450272377, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -633,7 +659,7 @@ PrefabInstance: - target: {fileID: 8875044595818467139, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 14 + value: 8 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -668,7 +694,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &425109995 +--- !u!114 &345795993 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -680,7 +706,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1760930532} + mTarget: {fileID: 2701980939299648210} --- !u!114 &429638430 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, @@ -693,6 +719,32 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &455860298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2701980939299648217} +--- !u!114 &470102552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2701980939299648207} --- !u!114 &483734264 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4136975465723208433, guid: 0b1e1a744f3d5447d88970ba4f22d761, @@ -925,6 +977,45 @@ Camera: type: 3} m_PrefabInstance: {fileID: 533409545} m_PrefabAsset: {fileID: 0} +--- !u!114 &534156921 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1446845735} +--- !u!114 &546291583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2701980939299648208} +--- !u!114 &574846742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2701980939299648211} --- !u!1 &586451194 GameObject: m_ObjectHideFlags: 0 @@ -1063,6 +1154,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639508187} m_CullTransparentMesh: 0 +--- !u!114 &726824446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2701980939299648218} --- !u!1 &748884348 GameObject: m_ObjectHideFlags: 0 @@ -1137,6 +1241,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 748884348} m_CullTransparentMesh: 0 +--- !u!114 &909006911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2701980939299648212} --- !u!1 &935850165 GameObject: m_ObjectHideFlags: 0 @@ -1211,7 +1328,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935850165} m_CullTransparentMesh: 0 ---- !u!114 &975365031 +--- !u!114 &1120976233 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1224,7 +1341,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1513025054} ---- !u!114 &1014028887 +--- !u!114 &1132265282 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1236,7 +1353,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1139655502} + mTarget: {fileID: 2701980939299648209} --- !u!114 &1139655502 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, @@ -1249,7 +1366,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1309171414 +--- !u!114 &1280486097 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1258,10 +1375,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1446845735} + mTarget: {fileID: 2701980939299648214} --- !u!1 &1322368921 GameObject: m_ObjectHideFlags: 0 @@ -1336,6 +1453,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322368921} m_CullTransparentMesh: 0 +--- !u!114 &1360480541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1760930532} --- !u!1 &1405932574 GameObject: m_ObjectHideFlags: 0 @@ -1434,7 +1564,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1599393028 +--- !u!114 &1542579404 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1447,6 +1577,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 429638430} +--- !u!114 &1692835948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2701980939299648215} --- !u!114 &1760930532 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, @@ -1459,6 +1602,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1782959392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1139655502} --- !u!1 &1941251214 GameObject: m_ObjectHideFlags: 0 @@ -1542,6 +1698,32 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2057808337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2701980939299648216} +--- !u!114 &2138186686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2701980939299648205} --- !u!1001 &2701980939299648204 PrefabInstance: m_ObjectHideFlags: 0 @@ -2303,3 +2485,171 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} +--- !u!114 &2701980939299648205 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4560236508152718986, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648206 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6285806631461451457, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648207 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4534594761780962508, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648208 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1883006365929839107, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648209 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5979409424124981824, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648210 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8826965070428866943, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648211 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 795262495608747387, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648212 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 795262494787334425, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648213 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 795262494940821442, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648214 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8826965070908774283, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648215 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8826965070841845091, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648216 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8826965070472475005, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648217 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8826965070724525141, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2701980939299648218 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8826965070414205926, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity b/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity index 9edb9928..f9e05876 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity @@ -207,19 +207,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ed2ddfb0a2ddd2945af65cd7881b97e0, + objectReference: {fileID: 21300000, guid: ba2136be20e049f46a0d5d2b8da36b2d, type: 3} - target: {fileID: 8660695104521205934, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1817140589b2aa3449e3972236b874c5, + objectReference: {fileID: 21300000, guid: 06a06fac70c152c48aca453cff4f2750, type: 3} - target: {fileID: 8660695104846840910, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 41d4ecc9e2cefff4babb89fa78a5ac78, + objectReference: {fileID: 21300000, guid: d5a0fe50a4b721f4981476bf8057c20a, type: 3} - target: {fileID: 8660695104952201896, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} @@ -380,13 +380,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ad8dde46c91fc7f4db2b42e6983fb2d6, + objectReference: {fileID: 21300000, guid: c8769d7124306d04ba4ec1b1f4f44c66, type: 3} - target: {fileID: 8660695105894842743, guid: 7a0e45165860f4e5099d690b636937a8, 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: 7a0e45165860f4e5099d690b636937a8, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index fbadf0de..43edb3ed 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -378,7 +378,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: 35 m_FontStyle: 0 m_BestFit: 0 @@ -390,7 +390,9 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.2 - m_Text: "\u30BF\u30F3\u30AF\u304C\u3044\u3063\u3071\u3044\u3067\u4F5C\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u2026\n\u3059\u3050\u306B\u7A7A\u304D\u3092\u4F5C\u308A\u305F\u3044\u5834\u5408\u306F\u8A66\u98DF\u3092\u4F7F\u3063\u3066\u307F\u3088\u3046\uFF01" + m_Text: "\uD0F1\uD06C\uAC00 \uAF49 \uCC28\uC11C \uB9CC\uB4E4 \uC218\uAC00 \uC5C6\uC5B4\uC694...\n\uBC14\uB85C + \uBE48 \uACF5\uAC04\uC744 \uB9CC\uB4E4\uACE0 \uC2F6\uB2E4\uBA74 \uC2DC\uC2DD\uC73C\uB85C + \uC124\uC815\uD574 \uBCF4\uC138\uC694! " --- !u!222 &255490371 CanvasRenderer: m_ObjectHideFlags: 0 @@ -466,7 +468,7 @@ RectTransform: m_GameObject: {fileID: 269597408} 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: 1853630203} m_RootOrder: 0 @@ -756,7 +758,7 @@ RectTransform: m_GameObject: {fileID: 430811414} 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: 1037294271} m_RootOrder: 0 @@ -1328,7 +1330,7 @@ RectTransform: m_GameObject: {fileID: 729526675} 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: 843133639} m_RootOrder: 0 @@ -1490,7 +1492,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -174, y: 164} - m_SizeDelta: {x: 230, y: 120} + m_SizeDelta: {x: 240, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &843133640 MonoBehaviour: @@ -2124,7 +2126,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 157, y: 164} - m_SizeDelta: {x: 230, y: 120} + m_SizeDelta: {x: 240, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1037294272 MonoBehaviour: @@ -2525,7 +2527,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c7b0a686aead508458a3655665cf4abd, type: 3} + m_Sprite: {fileID: 21300000, guid: e6412013568442542a823e8560326718, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3775,7 +3777,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 157, y: 164} - m_SizeDelta: {x: 230, y: 120} + m_SizeDelta: {x: 240, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1853630204 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index d73b7956..9b899c2e 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -121,6 +121,19 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &5984284 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1771084673} --- !u!1 &25421134 GameObject: m_ObjectHideFlags: 0 @@ -402,7 +415,7 @@ RectTransform: m_GameObject: {fileID: 103445604} 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: 968322476} m_RootOrder: 0 @@ -844,19 +857,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} ---- !u!114 &155550810 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1771084673} --- !u!1 &199954320 GameObject: m_ObjectHideFlags: 0 @@ -1895,6 +1895,19 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} +--- !u!114 &665613675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 2929932626674485992} --- !u!224 &701105333 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, @@ -2173,19 +2186,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &852600256 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1771084672} --- !u!1 &968322475 GameObject: m_ObjectHideFlags: 0 @@ -2224,7 +2224,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 36, y: -610} - m_SizeDelta: {x: 300, y: 150} + m_SizeDelta: {x: 320, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &968322477 MonoBehaviour: @@ -2618,19 +2618,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1119680655 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 759959154} --- !u!1001 &1193300603 PrefabInstance: m_ObjectHideFlags: 0 @@ -2885,7 +2872,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} ---- !u!114 &1272734409 +--- !u!114 &1308614124 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2897,7 +2884,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 2929932626674485992} + mTarget: {fileID: 759959154} --- !u!224 &1396650753 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, @@ -3522,6 +3509,19 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} +--- !u!114 &1516297109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 425834634} --- !u!1 &1554563048 GameObject: m_ObjectHideFlags: 0 @@ -3550,7 +3550,7 @@ RectTransform: m_GameObject: {fileID: 1554563048} 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: 1455181832} m_RootOrder: 0 @@ -3558,7 +3558,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 36, y: -111} - m_SizeDelta: {x: 404, y: 60} + m_SizeDelta: {x: 258, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1554563050 MonoBehaviour: @@ -4731,6 +4731,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1773113836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1771084672} --- !u!1001 &1831059052 PrefabInstance: m_ObjectHideFlags: 0 @@ -5257,7 +5270,7 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 136044098} m_PrefabAsset: {fileID: 0} ---- !u!114 &2029312778 +--- !u!114 &1983304606 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5269,7 +5282,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 425834634} + mTarget: {fileID: 1568730408} --- !u!114 &2062501365 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5357,19 +5370,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2120123252} m_CullTransparentMesh: 0 ---- !u!114 &2136308261 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1568730408} --- !u!1001 &2929932626674485991 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity b/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity index e53497a8..87d405aa 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity @@ -243,7 +243,7 @@ RectTransform: m_GameObject: {fileID: 271591787} 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: 1115920387} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 6312cf19..8a96624a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -28,7 +28,7 @@ RectTransform: m_GameObject: {fileID: 595622602241055462} 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: 5201848542625760891} m_RootOrder: 0 @@ -540,7 +540,7 @@ RectTransform: m_GameObject: {fileID: 1735230268650569057} 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: 8536603424566114135} m_RootOrder: 1 @@ -1028,7 +1028,7 @@ RectTransform: m_GameObject: {fileID: 6676402967053786540} 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: 7649393439858011681} m_RootOrder: 0 @@ -2178,7 +2178,7 @@ RectTransform: m_GameObject: {fileID: 8536603424202476249} 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: 8536603422629144348} m_RootOrder: 0 @@ -2564,7 +2564,7 @@ RectTransform: m_GameObject: {fileID: 8536603424476639146} 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: 8536603424566114135} m_RootOrder: 0 @@ -2829,7 +2829,7 @@ RectTransform: m_GameObject: {fileID: 8536603424714656551} 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: 8536603424418812069} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab index f047836f..f38c5484 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab @@ -28,7 +28,7 @@ RectTransform: m_GameObject: {fileID: 2895484395707725730} 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} m_Children: [] m_Father: {fileID: 7070062469376303877} m_RootOrder: 0 @@ -225,7 +225,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: 110} + m_SizeDelta: {x: 250, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1561612110923996906 CanvasRenderer: @@ -442,7 +442,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: 110} + m_SizeDelta: {x: 250, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133304335268316948 CanvasRenderer: @@ -606,7 +606,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -618,7 +618,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\uD569\uACC4" + m_Text: "\u5408\u8A08" --- !u!114 &4965073318475407547 MonoBehaviour: m_ObjectHideFlags: 0 @@ -723,7 +723,7 @@ RectTransform: m_GameObject: {fileID: 9133304335344414330} 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: 9133304335268316947} m_RootOrder: 0 @@ -760,7 +760,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, type: 3} + m_Sprite: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1470,7 +1470,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: 110} + m_SizeDelta: {x: 206, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133304335940276439 CanvasRenderer: @@ -1712,7 +1712,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2075,7 +2075,7 @@ RectTransform: m_GameObject: {fileID: 9133304336582582507} 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: 9133304335940276434} m_RootOrder: 0 @@ -2112,7 +2112,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f2ec7d503bc828a42b5ddc28c3eaaa48, type: 3} + m_Sprite: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2518,7 +2518,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity b/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity index d7924f50..96b7cd1d 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity @@ -146,13 +146,13 @@ PrefabInstance: - target: {fileID: 9133304335307007781, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} propertyPath: m_Text - value: "\uD569\uACC4" + value: "\u5408\u8A08" objectReference: {fileID: 0} - target: {fileID: 9133304335307007781, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 9133304335334808081, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} @@ -163,13 +163,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 9133304336582582509, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f2ec7d503bc828a42b5ddc28c3eaaa48, + objectReference: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, type: 3} - target: {fileID: 9133304336623725415, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index 6bc0c2f8..9076b933 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -187,6 +187,32 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &355620160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1098091312} +--- !u!114 &462971875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1098091308} --- !u!1 &553363513 GameObject: m_ObjectHideFlags: 0 @@ -270,7 +296,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &696394268 +--- !u!114 &555286545 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4137968107648010471, guid: 667a93fb2929943078b944050cddd464, + type: 3} + m_PrefabInstance: {fileID: 3078490422721459368} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &700940153 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -282,7 +320,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1098091310} + mTarget: {fileID: 1098091311} --- !u!114 &715888784 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4826861628800619564, guid: 667a93fb2929943078b944050cddd464, @@ -773,7 +811,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1126821185 +--- !u!114 &1135861150 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -785,7 +823,33 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1098091312} + mTarget: {fileID: 1098091309} +--- !u!114 &1351454005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1098091310} +--- !u!114 &1369737881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1789499952} --- !u!1001 &1450416387 PrefabInstance: m_ObjectHideFlags: 0 @@ -861,7 +925,19 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1450416387} m_PrefabAsset: {fileID: 0} ---- !u!114 &1491638584 +--- !u!114 &1789499952 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2365797324462302900, guid: 667a93fb2929943078b944050cddd464, + type: 3} + m_PrefabInstance: {fileID: 3078490422721459368} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2010180996 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -873,33 +949,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1098091311} ---- !u!114 &1835600534 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091309} ---- !u!114 &1904934204 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091308} + mTarget: {fileID: 555286545} --- !u!1001 &3078490422721459368 PrefabInstance: m_ObjectHideFlags: 0 @@ -1001,7 +1051,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 788033435718677201, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1066,104 +1116,104 @@ PrefabInstance: - target: {fileID: 1146852917836568778, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852917836568778, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1146852918367203974, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852918367203974, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1146852918627103335, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852918627103335, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1146852918952121867, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852918952121867, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1146852919051402256, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852919051402256, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1146852919246646992, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852919246646992, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1386000354116078935, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1386000354375716278, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1386000354625644315, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1386000355740936666, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1386000355848848321, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1386000355901493505, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1757697754891812348, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1349,8 +1399,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 10b76c8f490924a4497f1a1ce99ab197, + objectReference: {fileID: 21300000, guid: cb53b5ccd2d52784a86e49652e65aee7, type: 3} + - target: {fileID: 2365797324462302900, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3047480403827672010, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_AdditionalShaderChannelsFlag @@ -1360,13 +1415,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4137968107648010471, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9415d78c488ac65499e76da55fabb1a7, + objectReference: {fileID: 21300000, guid: 298367eae1e6abe40ad4a92148482dd8, type: 3} - target: {fileID: 4265797366405192145, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1423,37 +1478,37 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4711878981980077630, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4711878982179515646, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4711878982293283432, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4711878982570517129, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4711878982853265444, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 5255014595623885689, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1470,7 +1525,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1600952e851cce040812390c154d47b9, + objectReference: {fileID: 21300000, guid: 84efab5b8d1b5274cb7510ddcb5b2187, type: 3} - target: {fileID: 7296979764273611571, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1481,31 +1536,31 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8406322788165944276, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} - target: {fileID: 8406322788187973465, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8406322788219638036, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} - target: {fileID: 8406322788326259471, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} - target: {fileID: 8406322788473649226, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1531,19 +1586,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8406322788681368102, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322788744466662, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322788756460263, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1569,7 +1624,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322789033660934, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1615,7 +1670,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322789344742992, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1641,13 +1696,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322789441811918, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} - target: {fileID: 8406322789521831563, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1673,48 +1728,48 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8406322789691465571, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} - target: {fileID: 8406322789845613550, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8406322789951364994, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} - target: {fileID: 8406322789955138620, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322790122289935, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8760182090298572002, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 8760182090298572002, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 8977841923261503225, guid: 667a93fb2929943078b944050cddd464, type: 3} diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 9238ea88..abf9fc85 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -724,7 +724,7 @@ MonoBehaviour: - ui_button_icon_Tasting_logo_gray - Material_zh/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_zh[ui_button_icon_Tasting_logo_gray_zh] - Material_zh/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_zh[ui_button_icon_Tasting_logo_gray_zh] - - Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gra_ko[ui_button_icon_Tasting_logo_gra_ko] + - Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_ko[ui_button_icon_Tasting_logo_gray_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_button_icon_cancel_logo