diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_Achievement_title_text_daily_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_Achievement_title_text_daily_ko.png index 4d24294f..5ec5e411 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_Achievement_title_text_daily_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_Achievement_title_text_daily_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_Achievement_title_text_mission_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_Achievement_title_text_mission_ko.png index 438b484c..510dbba9 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_Achievement_title_text_mission_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_Achievement_title_text_mission_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_icon_Achievement_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_icon_Achievement_ko.png index 123856c7..eada8d8b 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_icon_Achievement_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_icon_Achievement_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_pop_button_text_daily_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_pop_button_text_daily_ko.png index 31e83fe4..0f0ff529 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_pop_button_text_daily_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_pop_button_text_daily_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_pop_button_text_mission_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_pop_button_text_mission_ko.png index 005f82ce..fe1035e0 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_pop_button_text_mission_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_Main_Mission_pop_button_text_mission_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_button_icon_completion_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_button_icon_completion_logo_ko.png index 73b329e8..52c13506 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_button_icon_completion_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_button_icon_completion_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_button_icon_progress_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_button_icon_progress_logo_ko.png index 113890c4..02cdf931 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_button_icon_progress_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Mission/ui_button_icon_progress_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_Main_movie_Achievement_title_text_coin_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_Main_movie_Achievement_title_text_coin_ko.png index b0053679..b63241fa 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_Main_movie_Achievement_title_text_coin_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_Main_movie_Achievement_title_text_coin_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_GreatSuccess_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_GreatSuccess_logo_ko.png index 30cd650f..138e09ca 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_GreatSuccess_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_GreatSuccess_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_movie_coin_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_movie_coin_logo_ko.png index 5043d5a0..55adc5cd 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_movie_coin_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_movie_coin_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_movie_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_movie_logo_ko.png index 80432624..37399daf 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_movie_logo_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/Movie/ui_button_icon_movie_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_a_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_a_ko.png index 9260895b..063940a5 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_a_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_a_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_b_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_b_ko.png index b3063ce0..b85eb988 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_b_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_b_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_c_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_c_ko.png index 8ac795b1..dddaaffb 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_c_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/Main/information/ui_Main_information_pop_button_text_c_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gra_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_ko.png similarity index 100% rename from popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gra_ko.png rename to popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_ko.png diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gra_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_ko.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gra_ko.png.meta rename to popcorn/Assets/MyGame/Resources/Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_ko.png.meta diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 61f0052b..7707823e 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -4026,7 +4026,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 740, y: 128} + m_SizeDelta: {x: 1104, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1705896411 MonoBehaviour: @@ -4047,9 +4047,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e1e47aea186eac6448bfe826fab7f6a4, type: 3} + m_Sprite: {fileID: 21300000, guid: 8b11af295f8c03d4f8b223920b9a7a37, 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/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index 5f6ea098..c6fad863 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab @@ -177,7 +177,7 @@ RectTransform: m_GameObject: {fileID: 2745295168150352131} 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: 5650193256109796436} m_RootOrder: 0 @@ -214,9 +214,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 219e2813d99bd6746abadbbb1ca5efba, type: 3} + m_Sprite: {fileID: 21300000, guid: 0e7856286a3221944ad85eb3ad09c93b, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -481,7 +481,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: 32 m_FontStyle: 0 m_BestFit: 0 @@ -493,7 +493,8 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "1\u682A\u304B\u30893\u672C\u53CE\u7A6B\u3067\u304D\u307E\u3059" + m_Text: "1\uADF8\uB8E8\uC5D0\uC11C 3\uC774\uC0AD\uC744 \uC218\uD655\uD560 \uC218 + \uC788\uC2B5\uB2C8\uB2E4." --- !u!114 &8636892512140272776 MonoBehaviour: m_ObjectHideFlags: 0 @@ -998,7 +999,7 @@ RectTransform: m_GameObject: {fileID: 8736114270452900669} 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: 8736114269955797017} m_RootOrder: 0 @@ -1956,7 +1957,7 @@ RectTransform: m_GameObject: {fileID: 8736114271397819355} 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: 8736114270625729305} m_RootOrder: 0 @@ -1993,7 +1994,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} + m_Sprite: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2108,7 +2109,7 @@ RectTransform: m_GameObject: {fileID: 8736114271449284253} 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: 8736114270758350254} m_RootOrder: 0 @@ -2377,7 +2378,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: 32 m_FontStyle: 0 m_BestFit: 0 @@ -2797,7 +2798,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: 32 m_FontStyle: 0 m_BestFit: 0 @@ -2877,7 +2878,7 @@ RectTransform: m_GameObject: {fileID: 8736114271781323283} 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: 8736114270417149868} m_RootOrder: 0 @@ -2914,7 +2915,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4cfc30a3bf61af2468eff2d37a9e1b5e, type: 3} + m_Sprite: {fileID: 21300000, guid: 52102f2f72a27fb40bb5d27bf309f6d1, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index 0a294813..8a5f191f 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -121,6 +121,19 @@ 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 @@ -178,7 +191,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0446a6dcc49bc9f4697d60ca28b559d0, type: 3} + m_Sprite: {fileID: 21300000, guid: 4c5f4520889b1ea42ad6bf74b0e96c30, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -236,7 +249,7 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 670145871} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &194516385 +--- !u!114 &181105024 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -248,7 +261,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166818} + mTarget: {fileID: 2616693359400416746} --- !u!114 &250939657 MonoBehaviour: m_ObjectHideFlags: 0 @@ -269,11 +282,29 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 528402689} m_Modifications: + - 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." + objectReference: {fileID: 0} + - target: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 2746775699208038261, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: lineType value: 2 objectReference: {fileID: 0} + - target: {fileID: 4882929337143975819, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0e7856286a3221944ad85eb3ad09c93b, + type: 3} - target: {fileID: 8736114270187051288, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_IsActive @@ -419,6 +450,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8736114271781323281, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 52102f2f72a27fb40bb5d27bf309f6d1, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} --- !u!224 &275189769 stripped @@ -439,30 +476,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &275189771 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271738746592, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 275189768} - 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 &275189772 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271781323281, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 275189768} - 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 &298872039 PrefabInstance: m_ObjectHideFlags: 0 @@ -470,11 +483,29 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 528402689} m_Modifications: + - 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." + objectReference: {fileID: 0} + - target: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 2746775699208038261, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: lineType value: 1 objectReference: {fileID: 0} + - target: {fileID: 4882929337143975819, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0e7856286a3221944ad85eb3ad09c93b, + type: 3} - target: {fileID: 8736114270187051288, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_IsActive @@ -595,6 +626,12 @@ PrefabInstance: propertyPath: m_Name value: detail (1) objectReference: {fileID: 0} + - target: {fileID: 8736114271397819353, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, + type: 3} - target: {fileID: 8736114271410563866, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_AnchoredPosition.x @@ -635,30 +672,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &298872042 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271533156906, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 298872039} - 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 &298872043 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271397819353, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 298872039} - 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!1 &308891212 GameObject: m_ObjectHideFlags: 0 @@ -733,19 +746,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 308891212} m_CullTransparentMesh: 0 ---- !u!114 &384015389 -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: 8736114270285166814} --- !u!1 &528402688 GameObject: m_ObjectHideFlags: 0 @@ -896,6 +896,19 @@ 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 @@ -933,32 +946,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1000, y: 1470} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1252932184 -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: 8736114270285166817} ---- !u!114 &1333700465 -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: 8736114270285166816} --- !u!1 &1440832243 GameObject: m_ObjectHideFlags: 0 @@ -1101,32 +1088,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2616693359400416742} m_PrefabAsset: {fileID: 0} ---- !u!114 &1656272764 -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: 8736114270285166813} ---- !u!114 &1712297005 -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: 298872043} --- !u!1 &1720684618 GameObject: m_ObjectHideFlags: 0 @@ -1184,7 +1145,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1459,7 +1420,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1918005794 +--- !u!114 &2024137685 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1471,46 +1432,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 275189772} ---- !u!114 &1987922511 -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: 275189771} ---- !u!114 &2003342434 -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: 8736114270285166815} ---- !u!114 &2011053212 -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: 298872042} + mTarget: {fileID: 2616693359400416745} --- !u!1 &2144327473 GameObject: m_ObjectHideFlags: 0 @@ -1624,6 +1546,17 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2616693359242844618, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_Text + value: "\uAC00\uACF5\uBA38\uC2E0" + objectReference: {fileID: 0} + - target: {fileID: 2616693359242844618, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 2616693360086915590, guid: 8990d570a96764364823ea362803dfcf, type: 3} propertyPath: m_Name @@ -1734,11 +1667,29 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2616693360776471842, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, + type: 3} + - target: {fileID: 5553657216358781386, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 35bd62be821f70647a2142fec78e7fd3, + type: 3} - target: {fileID: 5634060817564804317, guid: 8990d570a96764364823ea362803dfcf, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6461896231797963539, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 35bd62be821f70647a2142fec78e7fd3, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8990d570a96764364823ea362803dfcf, type: 3} --- !u!114 &2616693359400416743 stripped @@ -1753,6 +1704,54 @@ 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 @@ -1760,6 +1759,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 528402689} m_Modifications: + - 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." + objectReference: {fileID: 0} + - target: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 3975643701173361712, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_IsActive @@ -1770,6 +1781,12 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4882929337143975819, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0e7856286a3221944ad85eb3ad09c93b, + type: 3} - target: {fileID: 6796275775689852962, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_IsActive @@ -1900,6 +1917,12 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8736114271397819353, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, + type: 3} - target: {fileID: 8736114271410563866, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_AnchoredPosition.x @@ -1925,6 +1948,12 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8736114271781323281, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 52102f2f72a27fb40bb5d27bf309f6d1, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} --- !u!114 &8736114270285166812 stripped @@ -1939,75 +1968,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8736114270285166813 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - 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 &8736114270285166814 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4882929337143975819, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - 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 &8736114270285166815 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271738746592, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - 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 &8736114270285166816 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271781323281, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - 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 &8736114270285166817 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271533156906, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - 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 &8736114270285166818 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271397819353, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - 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/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index b60a7f5e..0e2fc5ae 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -305,7 +305,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 308891212} m_CullTransparentMesh: 0 ---- !u!114 &317708928 +--- !u!114 &309332070 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -317,7 +317,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1766466141} + mTarget: {fileID: 1402887490} --- !u!114 &442970493 MonoBehaviour: m_ObjectHideFlags: 0 @@ -532,7 +532,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.9, y: 4} - m_SizeDelta: {x: 118, y: 38} + m_SizeDelta: {x: 108, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &575026011 MonoBehaviour: @@ -553,7 +553,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} + m_Sprite: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -611,19 +611,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 442970493} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &598404965 -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 &653404265 GameObject: m_ObjectHideFlags: 0 @@ -1002,7 +989,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &865761135 RectTransform: m_ObjectHideFlags: 0 @@ -1305,7 +1292,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.9, y: 4} - m_SizeDelta: {x: 118, y: 38} + m_SizeDelta: {x: 108, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1020149467 MonoBehaviour: @@ -1326,7 +1313,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4cfc30a3bf61af2468eff2d37a9e1b5e, type: 3} + m_Sprite: {fileID: 21300000, guid: 52102f2f72a27fb40bb5d27bf309f6d1, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1595,7 +1582,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: 1 m_FillCenter: 1 @@ -1653,6 +1640,19 @@ 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 @@ -2176,6 +2176,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 5 objectReference: {fileID: 0} + - target: {fileID: 9078439763752813187, guid: a03eacc36379f7a4b9c976a5aaa17ee2, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 35bd62be821f70647a2142fec78e7fd3, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} --- !u!224 &1402887487 stripped @@ -2861,6 +2867,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 4.9999657 objectReference: {fileID: 0} + - target: {fileID: 9078439763752813187, guid: a03eacc36379f7a4b9c976a5aaa17ee2, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 35bd62be821f70647a2142fec78e7fd3, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} --- !u!224 &1766466138 stripped @@ -3071,7 +3083,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: 40 m_FontStyle: 0 m_BestFit: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Information.unity b/popcorn/Assets/MyGame/Scenes/Main/Information.unity index e4c4eecd..5824016d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Information.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Information.unity @@ -121,18 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &846582176 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6859128402182084773, guid: b9106333bdbe2421486d8af844a9b8cb, - type: 3} - m_PrefabInstance: {fileID: 6859128401289428600} - 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 &1556412026 PrefabInstance: m_ObjectHideFlags: 0 @@ -208,19 +196,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1556412026} m_PrefabAsset: {fileID: 0} ---- !u!114 &1892543846 -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: 846582176} --- !u!1001 &6859128401289428600 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index daa2b846..fc40a6d1 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -178,7 +178,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + objectReference: {fileID: 21300000, guid: 40947599d2383e249980484ff9c2abba, type: 3} - target: {fileID: 671564200103447854, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -210,7 +210,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + objectReference: {fileID: 21300000, guid: 40947599d2383e249980484ff9c2abba, type: 3} - target: {fileID: 2660639677052336234, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -321,7 +321,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, + objectReference: {fileID: 21300000, guid: 72cefa2f7b6bb3b40b9f05f60efeaaea, type: 3} - target: {fileID: 2660639678456833894, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -352,7 +352,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, + objectReference: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} - target: {fileID: 2660639679000795571, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -378,7 +378,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, + objectReference: {fileID: 21300000, guid: 8fa3b56a1abd868419e01c6a50384134, type: 3} - target: {fileID: 2660639679025358539, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -514,7 +514,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + objectReference: {fileID: 21300000, guid: 40947599d2383e249980484ff9c2abba, type: 3} - target: {fileID: 3664918248288857012, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -581,7 +581,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + objectReference: {fileID: 21300000, guid: 40947599d2383e249980484ff9c2abba, type: 3} - target: {fileID: 5631139686551261399, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity b/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity index c20dbedd..788a00d1 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity @@ -121,57 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &14450022 -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: 7864277047505245957} ---- !u!114 &88636772 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7864277048100900070, guid: a2309e5e619554230b1f6d3d9426ed51, - type: 3} - m_PrefabInstance: {fileID: 7864277047505245954} - 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 &263637616 -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: 7864277047505245955} ---- !u!114 &1348862323 -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: 88636772} --- !u!1001 &1944170687 PrefabInstance: m_ObjectHideFlags: 0 @@ -247,19 +196,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1944170687} m_PrefabAsset: {fileID: 0} ---- !u!114 &1993555408 -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: 7864277047505245956} --- !u!1001 &7864277047505245954 PrefabInstance: m_ObjectHideFlags: 0 @@ -382,11 +318,29 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7864277046940800485, guid: a2309e5e619554230b1f6d3d9426ed51, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 38d790c295ddce645bfcfb5e0edceb91, + type: 3} + - target: {fileID: 7864277047165460487, guid: a2309e5e619554230b1f6d3d9426ed51, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, + type: 3} - target: {fileID: 7864277047233171550, guid: a2309e5e619554230b1f6d3d9426ed51, type: 3} propertyPath: m_AnchoredPosition.y value: 250 objectReference: {fileID: 0} + - target: {fileID: 7864277048100900070, guid: a2309e5e619554230b1f6d3d9426ed51, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, + type: 3} - target: {fileID: 7864277048177254394, guid: a2309e5e619554230b1f6d3d9426ed51, type: 3} propertyPath: m_AnchoredPosition.y @@ -394,39 +348,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2309e5e619554230b1f6d3d9426ed51, type: 3} ---- !u!114 &7864277047505245955 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7864277047165460487, guid: a2309e5e619554230b1f6d3d9426ed51, - type: 3} - m_PrefabInstance: {fileID: 7864277047505245954} - 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 &7864277047505245956 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7864277047117909268, guid: a2309e5e619554230b1f6d3d9426ed51, - type: 3} - m_PrefabInstance: {fileID: 7864277047505245954} - 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 &7864277047505245957 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7864277046940800485, guid: a2309e5e619554230b1f6d3d9426ed51, - type: 3} - m_PrefabInstance: {fileID: 7864277047505245954} - 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/Main/Prefabs/BulkOrder/Information/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab index 04d99a22..394207cc 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab @@ -298,7 +298,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, type: 3} + m_Sprite: {fileID: 21300000, guid: 2e3ca880ffd16a544ae4ba28a84b35f1, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1264,7 +1264,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8c5b93ebfbed4964780f2d5137acb342, type: 3} + m_Sprite: {fileID: 21300000, guid: f4d07ea0e9de9a14b8e565680139e44c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2116,7 +2116,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 @@ -2128,7 +2128,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8A08\u30ED\u30B0\u30A4\u30F3\u6570" + m_Text: "\uB204\uACC4 \uB85C\uADF8\uC778 \uC218" --- !u!114 &6641915190159818204 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2272,7 +2272,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 @@ -2284,7 +2284,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8A08" + m_Text: "\uB204\uACC4" --- !u!114 &8484226659470063900 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2390,7 +2390,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 @@ -2402,7 +2402,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u304A\u5E97\u306E\u6B69\u307F" + m_Text: "\uAC00\uAC8C\uC758 \uBC1C\uC790\uCDE8" --- !u!114 &2516843243683150584 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3028,7 +3028,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 @@ -3040,7 +3040,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB" + m_Text: "\uAC00\uAC8C \uB808\uBCA8" --- !u!114 &1329620037901453848 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3258,7 +3258,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 @@ -3454,7 +3454,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 @@ -3466,7 +3466,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + m_Text: "\uB2E4\uC74C \uB808\uBCA8\uC5C5\uAE4C\uC9C0" --- !u!114 &6089248131259734773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3647,7 +3647,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 @@ -3659,7 +3659,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5546\u54C1\u5728\u5EAB" + m_Text: "\uC0C1\uD488 \uC7AC\uACE0" --- !u!114 &7038237413740392644 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3765,7 +3765,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 @@ -3994,7 +3994,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 @@ -4006,7 +4006,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8A08\u8CA9\u58F2\u6570" + m_Text: "\uB204\uACC4 \uD310\uB9E4 \uC218" --- !u!114 &2853590059505424815 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4227,7 +4227,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 @@ -4239,7 +4239,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u79F0\u53F7" + m_Text: "\uD0C0\uC774\uD2C0" --- !u!114 &862529373831645307 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4345,7 +4345,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 @@ -4503,7 +4503,7 @@ RectTransform: m_GameObject: {fileID: 6859128402182084771} 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: 6859128402407862776} m_RootOrder: 0 @@ -4540,9 +4540,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -4894,7 +4894,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 @@ -4906,7 +4906,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6750\u6599\u5728\u5EAB" + m_Text: "\uC7AC\uB8CC \uC7AC\uACE0" --- !u!114 &2317717004034477971 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5011,7 +5011,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} + m_Sprite: {fileID: 21300000, guid: 63ec188fd2e8fef449b5f77c547c8a26, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -5441,7 +5441,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 @@ -5453,7 +5453,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB" + m_Text: "\uAC00\uAC8C \uB808\uBCA8" --- !u!114 &1113115768491845702 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6051,7 +6051,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 @@ -6063,7 +6063,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8A08\u53D6\u5F97\u30B3\u30A4\u30F3" + m_Text: "\uB204\uACC4 \uCDE8\uB4DD \uCF54\uC778" --- !u!114 &2645931646123064803 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6509,7 +6509,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 @@ -6808,6 +6808,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -6932,7 +6938,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -6949,6 +6955,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -7073,7 +7085,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -7094,7 +7106,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 4260782103887353672, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -7215,7 +7227,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -7236,7 +7248,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 1140500467267622730, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -7357,7 +7369,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -7378,7 +7390,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 1140500467267622730, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -7494,7 +7506,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -7511,6 +7523,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -7625,7 +7643,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -7642,6 +7660,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -7756,7 +7780,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -7773,6 +7797,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344180914081, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_IsActive @@ -7897,7 +7927,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -7914,6 +7944,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -8028,7 +8064,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8045,6 +8081,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -8159,7 +8201,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8176,6 +8218,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -8290,7 +8338,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8307,6 +8355,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -8421,7 +8475,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8438,6 +8492,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -8552,7 +8612,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8569,6 +8629,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -8683,7 +8749,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8700,6 +8766,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -8814,7 +8886,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8831,6 +8903,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -8945,7 +9023,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8962,6 +9040,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -9076,7 +9160,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -9093,6 +9177,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -9207,7 +9297,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -9224,6 +9314,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6859128401143531340} m_Modifications: + - target: {fileID: 1442642106177556608, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + type: 3} - target: {fileID: 6878252344716020596, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} propertyPath: m_Pivot.x @@ -9338,7 +9434,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -9359,7 +9455,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 4260782103887353672, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -9475,7 +9571,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab index 1011f1ab..f24c7581 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab @@ -671,7 +671,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8a4a83b58fd845d4c8c98fd67fde9139, type: 3} + m_Sprite: {fileID: 21300000, guid: 38d790c295ddce645bfcfb5e0edceb91, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -900,14 +900,14 @@ RectTransform: m_GameObject: {fileID: 7864277047165460481} 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: 7864277048159705408} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 127, y: 2} + m_AnchoredPosition: {x: 141, y: 2} m_SizeDelta: {x: 130, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7864277047165460484 @@ -937,7 +937,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} + m_Sprite: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1148,7 +1148,7 @@ RectTransform: m_GameObject: {fileID: 7864277048100900064} 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: 7864277046190771843} m_RootOrder: 0 @@ -1185,9 +1185,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 850f09fd..44853fbc 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -3167,7 +3167,7 @@ RectTransform: m_GameObject: {fileID: 2660639678739049206} 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: 2660639677226912967} m_RootOrder: 0 @@ -3206,7 +3206,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -4417,9 +4417,9 @@ RectTransform: m_Father: {fileID: 2660639677693138925} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 420, y: -592} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 840, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5505592798233738046 @@ -4494,9 +4494,9 @@ RectTransform: m_Father: {fileID: 2660639677693138925} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 420, y: -352} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 840, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7028437475535944935 @@ -5144,9 +5144,9 @@ RectTransform: m_Father: {fileID: 2660639677693138925} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 420, y: -832} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 840, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6662879993327949048 @@ -7358,7 +7358,7 @@ PrefabInstance: - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} @@ -7368,7 +7368,7 @@ PrefabInstance: - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} @@ -7418,12 +7418,12 @@ PrefabInstance: - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_AnchoredPosition.x - value: 415 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_AnchoredPosition.y - value: -112 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab index bc894226..ea81150d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab @@ -293,7 +293,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -1526,7 +1526,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} + m_Sprite: {fileID: 21300000, guid: 40947599d2383e249980484ff9c2abba, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index d458942f..836e86f4 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity @@ -1744,7 +1744,7 @@ RectTransform: m_GameObject: {fileID: 1664081616} 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: 4540745} m_RootOrder: 0 @@ -1773,9 +1773,9 @@ 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_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2166,7 +2166,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 @@ -2814,7 +2814,7 @@ RectTransform: m_GameObject: {fileID: 2130390879} 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: 208413210} m_RootOrder: 0 @@ -2843,7 +2843,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 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity index 5ded38bc..f4c77462 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity @@ -474,7 +474,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1077,7 +1077,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -4, y: 20} - m_SizeDelta: {x: 280, y: 60} + m_SizeDelta: {x: 196, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1587966891 MonoBehaviour: @@ -1098,7 +1098,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f247faa75d88e5c40a92444ba0e075c3, type: 3} + m_Sprite: {fileID: 21300000, guid: e2831d465ad30b44a8c7c0dc17763b5a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/update.unity b/popcorn/Assets/MyGame/Scenes/Main/update.unity index 24d8526a..10db9bd9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/update.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/update.unity @@ -787,7 +787,7 @@ RectTransform: m_GameObject: {fileID: 764676370} 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: 393391859} m_RootOrder: 0 @@ -816,7 +816,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1534,7 +1534,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 200} - m_SizeDelta: {x: 686, y: 60} + m_SizeDelta: {x: 720, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1711742985 MonoBehaviour: @@ -1555,7 +1555,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2aa09e79e9eb3d74cb962b15849648f3, type: 3} + m_Sprite: {fileID: 21300000, guid: 84f89be4d9494764d8d3a01701bdc98a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1