diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab index 2747f702..a7620e32 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab @@ -193,7 +193,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -4, y: -32} - m_SizeDelta: {x: 250, y: 34} + m_SizeDelta: {x: 250, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2616693359242844619 CanvasRenderer: @@ -223,7 +223,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 32 m_FontStyle: 1 m_BestFit: 0 @@ -235,7 +235,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\uAC00\uACF5\uBA38\uC2E0" + m_Text: "\uAC00\uACF5\uBA38\uC2E0" --- !u!114 &1134178393517056210 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1292,7 +1292,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -133, y: -9} + m_AnchoredPosition: {x: -133, y: -13} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2616693360873139563 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index 02df43dc..cc9c2230 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -236,7 +236,7 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 670145871} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &162009494 +--- !u!114 &120592051 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -245,10 +245,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: 8736114270285166818} + mTarget: {fileID: 298872042} --- !u!114 &250939657 MonoBehaviour: m_ObjectHideFlags: 0 @@ -705,19 +705,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &304441286 -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: 275189772} --- !u!1 &308891212 GameObject: m_ObjectHideFlags: 0 @@ -792,6 +779,32 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 308891212} m_CullTransparentMesh: 0 +--- !u!114 &311325123 +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 &446981722 +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!1 &528402688 GameObject: m_ObjectHideFlags: 0 @@ -979,20 +992,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1000, y: 1470} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1055512207 -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!114 &1265539205 +--- !u!114 &969354162 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1005,7 +1005,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 8736114270285166816} ---- !u!114 &1416419437 +--- !u!114 &1186017371 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1018,7 +1018,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 8736114270285166815} ---- !u!114 &1425719356 +--- !u!114 &1365259213 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1027,10 +1027,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 275189771} + mTarget: {fileID: 8736114270285166814} --- !u!1 &1440832243 GameObject: m_ObjectHideFlags: 0 @@ -1167,7 +1167,7 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 ---- !u!114 &1502868211 +--- !u!114 &1472403857 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1179,14 +1179,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166814} + mTarget: {fileID: 275189772} --- !u!224 &1530261473 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616693360086915591, guid: 8990d570a96764364823ea362803dfcf, type: 3} m_PrefabInstance: {fileID: 2616693359400416742} m_PrefabAsset: {fileID: 0} ---- !u!114 &1556523258 +--- !u!114 &1545512310 +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: 8736114270285166818} +--- !u!114 &1562658123 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1198,7 +1211,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166817} + mTarget: {fileID: 2616693359400416744} --- !u!1 &1720684618 GameObject: m_ObjectHideFlags: 0 @@ -1531,7 +1544,20 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1928967295 +--- !u!114 &1879364843 +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!114 &2035333639 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1543,20 +1569,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166813} ---- !u!114 &2137790002 -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: 8736114270285166817} --- !u!1 &2144327473 GameObject: m_ObjectHideFlags: 0 @@ -1665,22 +1678,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 528402689} m_Modifications: - - target: {fileID: 2616693359035986546, guid: 8990d570a96764364823ea362803dfcf, + - target: {fileID: 1134178393517056210, guid: 8990d570a96764364823ea362803dfcf, type: 3} - 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 + propertyPath: mLocalizeTarget value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, - type: 3} + objectReference: {fileID: 1562658123} - target: {fileID: 2616693360086915590, guid: 8990d570a96764364823ea362803dfcf, type: 3} propertyPath: m_Name @@ -1791,29 +1793,6 @@ 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 @@ -1828,6 +1807,18 @@ 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!1001 &8736114270285166811 PrefabInstance: m_ObjectHideFlags: 0 @@ -1838,14 +1829,14 @@ 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\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, + objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} - target: {fileID: 3975643701173361712, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity index c25856ae..5a3c24e0 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity @@ -157,7 +157,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 126} - m_SizeDelta: {x: 780, y: 900} + m_SizeDelta: {x: 820, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &185282313 MonoBehaviour: @@ -454,7 +454,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 250.00003, y: 1} + m_AnchoredPosition: {x: 267.00003, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &369996024 @@ -529,7 +529,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -45, y: -0.00007247925} + m_AnchoredPosition: {x: -60, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &445717700 @@ -552,7 +552,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, 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: "\uD68D\uB4DD\uAE4C\uC9C0 \uD544\uC694\uD55C \uC2DC\uAC04" + m_Text: "\uD68D\uB4DD\uAE4C\uC9C0 \uD544\uC694\uD55C \uC2DC\uAC04" --- !u!222 &445717701 CanvasRenderer: m_ObjectHideFlags: 0 @@ -648,7 +648,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 250, y: 1} + m_AnchoredPosition: {x: 267, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &497376572 @@ -1011,7 +1011,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -74, y: -30.000103} + m_AnchoredPosition: {x: -89, y: -30.000103} m_SizeDelta: {x: 550, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &617186344 @@ -1339,7 +1339,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 128.99995} - m_SizeDelta: {x: 700, y: 70} + m_SizeDelta: {x: 740, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1059000511 GameObject: @@ -1375,7 +1375,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -74, y: -30.000103} + m_AnchoredPosition: {x: -89, y: -30.000103} m_SizeDelta: {x: 550, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1059000513 @@ -1450,7 +1450,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -45, y: -0.00007247925} + m_AnchoredPosition: {x: -60, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1165270082 @@ -1473,7 +1473,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, 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: "\uD68D\uB4DD\uD560 \uC218 \uC788\uB294 \uD31D\uCF58" + m_Text: "\uD68D\uB4DD\uD560 \uC218 \uC788\uB294 \uD31D\uCF58" --- !u!222 &1165270083 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1822,7 +1822,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -59} - m_SizeDelta: {x: 726, y: 400} + m_SizeDelta: {x: 770, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1228675119 MonoBehaviour: @@ -1989,7 +1989,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -74, y: -30.000103} + m_AnchoredPosition: {x: -89, y: -30.000103} m_SizeDelta: {x: 550, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1330781664 @@ -2181,7 +2181,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -37.00005} - m_SizeDelta: {x: 700, y: 70} + m_SizeDelta: {x: 740, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1393575074 GameObject: @@ -2297,7 +2297,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -121} - m_SizeDelta: {x: 700, y: 70} + m_SizeDelta: {x: 740, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1548233490 MonoBehaviour: @@ -2407,7 +2407,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -2419,10 +2419,10 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.2 - m_Text: "\uC790\uB3D9 \uC870\uB9AC\uB97C \uC0AC\uC6A9\uD558\uBA74 \uC77C\uC815 + 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? " + \uC870\uB9AC\uB97C \uC0AC\uC6A9\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? " --- !u!222 &1633334325 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2506,7 +2506,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 250.00003, y: 1} + m_AnchoredPosition: {x: 267.00003, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1643570443 @@ -2655,7 +2655,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -45, y: -0.00007247925} + m_AnchoredPosition: {x: -60, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1667839400 @@ -2678,7 +2678,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2690,7 +2690,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\uB808\uBCA8\uC5C5\uC5D0 \uD544\uC694\uD55C \uC0AC\uC6A9 \uD69F\uC218" + m_Text: "\uB808\uBCA8\uC5C5\uC5D0 \uD544\uC694\uD55C \uC0AC\uC6A9 \uD69F\uC218" --- !u!222 &1667839401 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2774,7 +2774,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 250, y: 1} + m_AnchoredPosition: {x: 267, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1676166303 @@ -3100,7 +3100,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -45, y: -0.00007247925} + m_AnchoredPosition: {x: -60, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1771385232 @@ -3162,7 +3162,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -3174,7 +3174,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\uC790\uB3D9 \uC870\uB9AC \uB808\uBCA8" + m_Text: "\uC790\uB3D9 \uC870\uB9AC \uB808\uBCA8" --- !u!222 &1771385234 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3218,7 +3218,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: 780, y: 900} + m_SizeDelta: {x: 820, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1828954259 MonoBehaviour: @@ -3306,7 +3306,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 45.99995} - m_SizeDelta: {x: 700, y: 70} + m_SizeDelta: {x: 740, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1871538572 MonoBehaviour: @@ -3707,7 +3707,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -74, y: -30.000103} + m_AnchoredPosition: {x: -89, y: -30.000103} m_SizeDelta: {x: 550, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2100577140 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index f618a97b..e326eedd 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -1011,7 +1011,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: 170, y: 30} + m_SizeDelta: {x: 200, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875338846986 CanvasRenderer: @@ -1041,7 +1041,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 29 m_FontStyle: 0 m_BestFit: 1 @@ -1635,7 +1635,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 0 @@ -1753,7 +1753,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -1841,7 +1841,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: 170, y: 30} + m_SizeDelta: {x: 200, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875805691669 CanvasRenderer: @@ -1871,7 +1871,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 29 m_FontStyle: 0 m_BestFit: 1 @@ -2741,7 +2741,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} - target: {fileID: 6575807548503812178, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2909,7 +2909,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} - target: {fileID: 4755900518491743640, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3102,7 +3102,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} - target: {fileID: 4755900518491743640, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3280,7 +3280,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} - target: {fileID: 4755900518491743640, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3483,7 +3483,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} - target: {fileID: 4755900518491743640, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index 43edb3ed..9ff56eb1 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -1242,7 +1242,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 1 @@ -1903,7 +1903,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 33 m_FontStyle: 1 m_BestFit: 1 @@ -2270,7 +2270,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: 200, y: 35} + m_SizeDelta: {x: 220, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1109202679 MonoBehaviour: @@ -2292,7 +2292,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -2410,7 +2410,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -3539,7 +3539,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -3, y: -30} - m_SizeDelta: {x: 180, y: 40} + m_SizeDelta: {x: 200, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1649038408 MonoBehaviour: @@ -3561,7 +3561,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 28 m_FontStyle: 1 m_BestFit: 0 @@ -3573,7 +3573,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\uD544\uC694\uD55C \uC7AC\uB8CC" + m_Text: "\uD544\uC694\uD55C \uC7AC\uB8CC" --- !u!222 &1649038409 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4057,7 +4057,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 27 m_FontStyle: 0 m_BestFit: 1 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab index f38c5484..293e4125 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab @@ -606,7 +606,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, 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: "\u5408\u8A08" + m_Text: "\uD569\uACC4" --- !u!114 &4965073318475407547 MonoBehaviour: m_ObjectHideFlags: 0 @@ -760,7 +760,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} + m_Sprite: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1682,7 +1682,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: 211.9, y: 35} + m_SizeDelta: {x: 220, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133304336153810483 CanvasRenderer: @@ -1712,7 +1712,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2112,7 +2112,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, type: 3} + m_Sprite: {fileID: 21300000, guid: f2ec7d503bc828a42b5ddc28c3eaaa48, 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: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0