diff --git a/popcorn/Assets/MyGame/Resource/Fonts/Gaegu-Bold.ttf b/popcorn/Assets/MyGame/Resource/Fonts/Gaegu-Bold.ttf new file mode 100644 index 00000000..57910f19 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Fonts/Gaegu-Bold.ttf differ diff --git a/popcorn/Assets/MyGame/Resource/Fonts/Gaegu-Bold.ttf.meta b/popcorn/Assets/MyGame/Resource/Fonts/Gaegu-Bold.ttf.meta new file mode 100644 index 00000000..799db57b --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Fonts/Gaegu-Bold.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2a538aefbbc86f343a252fcb7cc6fb7f +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Gaegu + fontNames: + - Gaegu + fallbackFontReferences: + - {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_Stand.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_Stand.png.meta index aa4c823e..0d8d768e 100644 --- a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_Stand.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_Stand.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 180, y: 0, z: 180, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/CornField/ui_CornField_corn_text_grain_addition_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/CornField/ui_CornField_corn_text_grain_addition_ko.png.meta index c9c0e407..f7b3de7a 100644 --- a/popcorn/Assets/MyGame/Resources/Material_ko/CornField/ui_CornField_corn_text_grain_addition_ko.png.meta +++ b/popcorn/Assets/MyGame/Resources/Material_ko/CornField/ui_CornField_corn_text_grain_addition_ko.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 55, y: 0, z: 64, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/CornField/ui_CornField_corn_text_grain_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/CornField/ui_CornField_corn_text_grain_ko.png.meta index 2ceb1492..e00e5eef 100644 --- a/popcorn/Assets/MyGame/Resources/Material_ko/CornField/ui_CornField_corn_text_grain_ko.png.meta +++ b/popcorn/Assets/MyGame/Resources/Material_ko/CornField/ui_CornField_corn_text_grain_ko.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 48, y: 36, z: 48, w: 36} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab index fc6b65de..588234f5 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab @@ -64,7 +64,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: -2.8, y: 76.999985} + m_AnchoredPosition: {x: -5.6000185, y: 76.999985} m_SizeDelta: {x: 38, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1811976284931718311 @@ -139,8 +139,8 @@ 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: -31, y: 76.999985} - m_SizeDelta: {x: 38, y: 38} + m_AnchoredPosition: {x: -42.20002, y: 76.999985} + m_SizeDelta: {x: 62, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4555403431718143716 CanvasRenderer: @@ -169,9 +169,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1b9f45eaa19d03341a776a55e81a0f1a, type: 3} + m_Sprite: {fileID: 21300000, guid: 40eb244aa806bdb4b81c1a81fa51811c, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -505,8 +505,8 @@ 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: 26, y: 76.999985} - m_SizeDelta: {x: 38, y: 38} + m_AnchoredPosition: {x: 35.4, y: 76.999985} + m_SizeDelta: {x: 62, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5016968348897512713 CanvasRenderer: @@ -535,9 +535,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 85b31be12a772f64da682745a8fc9750, type: 3} + m_Sprite: {fileID: 21300000, guid: 443815280ba7b6a4283b74716f6e1438, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3022,7 +3022,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -0.000030517578, y: 76.999985} - m_SizeDelta: {x: 38, y: 38} + m_SizeDelta: {x: 62, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8326132141718845777 CanvasRenderer: @@ -3051,9 +3051,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 85b31be12a772f64da682745a8fc9750, type: 3} + m_Sprite: {fileID: 21300000, guid: 443815280ba7b6a4283b74716f6e1438, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -6418,7 +6418,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8326132142916714447 RectTransform: m_ObjectHideFlags: 0 @@ -6436,7 +6436,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -0.000030517578, y: 76.999985} - m_SizeDelta: {x: 38, y: 38} + m_SizeDelta: {x: 62, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8326132142916714441 CanvasRenderer: @@ -6465,9 +6465,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1b9f45eaa19d03341a776a55e81a0f1a, type: 3} + m_Sprite: {fileID: 21300000, guid: 40eb244aa806bdb4b81c1a81fa51811c, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -6560,7 +6560,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5325445695590656810 RectTransform: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab index 1d8473cb..30c38364 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5432270798510394095 RectTransform: m_ObjectHideFlags: 0 @@ -141,7 +141,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: 1 m_BestFit: 0 @@ -153,7 +153,8 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.25 - m_Text: "\u3057\u3070\u3089\u304F\u306E\u9593\u8CFC\u5165\u3059\u308B\u304A\u5BA2\u3055\u3093\u304C\n\u5C11\u3057\u5897\u3048\u308B\u3088" + m_Text: "\uC7A0\uAE50 \uC0AC\uC774\uC5D0 \uAD6C\uB9E4\uD558\uB294 \uACE0\uAC1D\uC774 + \uC880 \uB298\uC5C8\uC5B4\uC694" --- !u!114 &1424299160027476878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -563,7 +564,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 6} - m_SizeDelta: {x: 208, y: 52} + m_SizeDelta: {x: 172, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7492023257525246333 CanvasRenderer: @@ -592,7 +593,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} + m_Sprite: {fileID: 21300000, guid: 9f0a40802a4be0e4885581f13627c3c2, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -707,7 +708,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ed8b1627a2d343c43a520c5c0496cf82, type: 3} + m_Sprite: {fileID: 21300000, guid: a59d1aedd5c8dfd42913d2d2b0a518bd, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1580,7 +1581,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: eca622205a7dc214384aad3d918584bd, type: 3} + m_Sprite: {fileID: 21300000, guid: 1cedeefbe9e6c4940bbf067d1b9fca3c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1740,7 +1741,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 6} - m_SizeDelta: {x: 208, y: 52} + m_SizeDelta: {x: 172, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1104163593313499312 CanvasRenderer: @@ -1769,7 +1770,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 25e87dbf8c9dca34884b8267401b0a2a, type: 3} + m_Sprite: {fileID: 21300000, guid: e50d5b91d4c431d49ae7f5429850bfbf, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2025,7 +2026,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 2705466136985562315, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2036,7 +2037,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 2705466137083800160, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2047,7 +2048,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 2705466137392089852, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2578,7 +2579,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, + objectReference: {fileID: 21300000, guid: 8569c0f8839941642b7637c9440ce2b1, type: 3} - target: {fileID: 6124127957932188863, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2589,7 +2590,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 6124127958617077932, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2601,7 +2602,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 55e5ffb0b46417e4bb53cad07ee560a4, + objectReference: {fileID: 21300000, guid: f65affcfe9a325a4dbad7edc91dfe083, type: 3} - target: {fileID: 6134734927453340133, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab index 4e9eba69..0918c8ee 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab @@ -267,7 +267,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: 225, y: 7} + m_AnchoredPosition: {x: 245, y: 7} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127957076174809 @@ -343,7 +343,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: 350, y: 88} + m_SizeDelta: {x: 420, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127957328696059 CanvasRenderer: @@ -502,7 +502,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6124127957800881881 RectTransform: m_ObjectHideFlags: 0 @@ -521,7 +521,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: 350, y: 88} + m_SizeDelta: {x: 420, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127957800881884 CanvasRenderer: @@ -596,7 +596,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 5} - m_SizeDelta: {x: 176, y: 40} + m_SizeDelta: {x: 220, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127957921725994 CanvasRenderer: @@ -625,7 +625,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5669304b3d9643b489cc2f08d1699160, type: 3} + m_Sprite: {fileID: 21300000, guid: d57063cf737a5c44d8ea58a4bc72edec, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -740,7 +740,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, type: 3} + m_Sprite: {fileID: 21300000, guid: 8569c0f8839941642b7637c9440ce2b1, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -826,7 +826,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: 286, y: 40} + m_SizeDelta: {x: 292, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127957979847859 CanvasRenderer: @@ -855,7 +855,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 39d00b01cf9866c449ee01e331f4a52b, type: 3} + m_Sprite: {fileID: 21300000, guid: f805024c7d7237d4c96bcb63f0396b12, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -942,7 +942,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: -225, y: 7} + m_AnchoredPosition: {x: -245, y: 7} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127958085519808 @@ -1075,7 +1075,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6124127958242834723 RectTransform: m_ObjectHideFlags: 0 @@ -1094,7 +1094,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 5.0000005} - m_SizeDelta: {x: 350, y: 98} + m_SizeDelta: {x: 420, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127958242834726 CanvasRenderer: @@ -1226,8 +1226,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -16} - m_SizeDelta: {x: 392, y: 98} + m_AnchoredPosition: {x: 0, y: -29} + m_SizeDelta: {x: 460, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127958482727415 CanvasRenderer: @@ -1302,7 +1302,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 5} - m_SizeDelta: {x: 286, y: 40} + m_SizeDelta: {x: 292, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127958617077933 CanvasRenderer: @@ -1331,7 +1331,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c981e97ae7f318346906c68c0c2dfcc6, type: 3} + m_Sprite: {fileID: 21300000, guid: 772bec0aff827fe4a998a9a224e086bb, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1415,8 +1415,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -16} - m_SizeDelta: {x: 392, y: 98} + m_AnchoredPosition: {x: 0, y: -29} + m_SizeDelta: {x: 460, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127958621164129 CanvasRenderer: @@ -1446,7 +1446,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: f97ae1287a7afd04dbd16aedae83beec, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1493,7 +1493,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 5} - m_SizeDelta: {x: 350, y: 98} + m_SizeDelta: {x: 420, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127958658035354 CanvasRenderer: @@ -1627,7 +1627,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: 176, y: 40} + m_SizeDelta: {x: 220, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127958769025435 CanvasRenderer: @@ -1656,7 +1656,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 55e5ffb0b46417e4bb53cad07ee560a4, type: 3} + m_Sprite: {fileID: 21300000, guid: f65affcfe9a325a4dbad7edc91dfe083, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2037,7 +2037,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: 61beefd3a05503e419363598678ad43a, type: 3} @@ -2472,7 +2472,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: 61beefd3a05503e419363598678ad43a, type: 3} @@ -3052,7 +3052,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: 61beefd3a05503e419363598678ad43a, type: 3} @@ -3487,7 +3487,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: 61beefd3a05503e419363598678ad43a, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 0574fcc8..d5427b9c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -219,7 +219,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, + objectReference: {fileID: 21300000, guid: 52c59ab27fa50ee4e8a6039814ed9a70, type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -360,13 +360,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, + objectReference: {fileID: 21300000, guid: 150bcaedfe3234047a8f48028269cfc9, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, + objectReference: {fileID: 21300000, guid: d0ae1ddf0517a7242abc6fcd17acf837, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -517,7 +517,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, + objectReference: {fileID: 21300000, guid: d133cc46d23f4e044924f0bf0d886082, type: 3} - target: {fileID: 3664916832825273574, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -563,7 +563,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, + objectReference: {fileID: 21300000, guid: 03cf33d3fbc95cd48a1d55a2d6ae9d15, type: 3} - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -668,92 +668,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &219610915 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 219610911} - 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 &219610916 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 219610911} - 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 &219610917 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 219610911} - 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 &219610918 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 219610911} - 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 &219610919 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 219610911} - 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 &354860394 -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: 219610915} ---- !u!114 &426847968 -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: 219610918} --- !u!114 &483734264 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4136975465723208433, guid: 0b1e1a744f3d5447d88970ba4f22d761, @@ -1124,19 +1038,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639508187} m_CullTransparentMesh: 0 ---- !u!114 &667927117 -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: 219610917} --- !u!1 &748884348 GameObject: m_ObjectHideFlags: 0 @@ -1359,19 +1260,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322368921} m_CullTransparentMesh: 0 ---- !u!114 &1347844655 -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: 219610919} --- !u!1 &1405932574 GameObject: m_ObjectHideFlags: 0 @@ -1446,19 +1334,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1405932574} m_CullTransparentMesh: 0 ---- !u!114 &1794606741 -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: 219610916} --- !u!1 &1941251214 GameObject: m_ObjectHideFlags: 0 @@ -1753,7 +1628,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, + objectReference: {fileID: 21300000, guid: 9f0a40802a4be0e4885581f13627c3c2, type: 3} - target: {fileID: 2118578838188127427, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -1990,7 +1865,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: eca622205a7dc214384aad3d918584bd, + objectReference: {fileID: 21300000, guid: 1cedeefbe9e6c4940bbf067d1b9fca3c, type: 3} - target: {fileID: 5939429326738238117, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -2056,7 +1931,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ed8b1627a2d343c43a520c5c0496cf82, + objectReference: {fileID: 21300000, guid: a59d1aedd5c8dfd42913d2d2b0a518bd, type: 3} - target: {fileID: 6040599672751541160, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -2141,13 +2016,14 @@ PrefabInstance: - target: {fileID: 6285806631461451457, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_Text - value: "\u3057\u3070\u3089\u304F\u306E\u9593\u8CFC\u5165\u3059\u308B\u304A\u5BA2\u3055\u3093\u304C\n\u5C11\u3057\u5897\u3048\u308B\u3088" + value: "\uC7A0\uAE50 \uC0AC\uC774\uC5D0 \uAD6C\uB9E4\uD558\uB294 \uACE0\uAC1D\uC774 + \uC880 \uB298\uC5C8\uC5B4\uC694" objectReference: {fileID: 0} - target: {fileID: 6285806631461451457, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} - target: {fileID: 7786810388559140403, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -2189,23 +2065,35 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8826965070414205926, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d57063cf737a5c44d8ea58a4bc72edec, + type: 3} - target: {fileID: 8826965070428866943, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, + objectReference: {fileID: 21300000, guid: 8569c0f8839941642b7637c9440ce2b1, + type: 3} + - target: {fileID: 8826965070472475005, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f805024c7d7237d4c96bcb63f0396b12, type: 3} - target: {fileID: 8826965070724525141, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 55e5ffb0b46417e4bb53cad07ee560a4, + objectReference: {fileID: 21300000, guid: f65affcfe9a325a4dbad7edc91dfe083, type: 3} - target: {fileID: 8826965070841845091, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c981e97ae7f318346906c68c0c2dfcc6, + objectReference: {fileID: 21300000, guid: 772bec0aff827fe4a998a9a224e086bb, type: 3} - target: {fileID: 8908151885642361585, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity b/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity index 3badb6ed..7bc6f7d4 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity @@ -241,6 +241,12 @@ PrefabInstance: propertyPath: m_Layer value: 4 objectReference: {fileID: 0} + - target: {fileID: 7082417227195167442, guid: dcd945ce96b2149a0a5f9f2be4b2fbea, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 40eb244aa806bdb4b81c1a81fa51811c, + type: 3} - target: {fileID: 7121406970124810731, guid: dcd945ce96b2149a0a5f9f2be4b2fbea, type: 3} propertyPath: m_Layer @@ -747,6 +753,12 @@ PrefabInstance: propertyPath: m_Layer value: 4 objectReference: {fileID: 0} + - target: {fileID: 8829469831934171879, guid: dcd945ce96b2149a0a5f9f2be4b2fbea, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 443815280ba7b6a4283b74716f6e1438, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dcd945ce96b2149a0a5f9f2be4b2fbea, type: 3} --- !u!114 &8326132141691006229 stripped diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index e4ce65a6..9238ea88 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -24,7 +24,7 @@ MonoBehaviour: - DFHannotateStdN-W7 - DFPYuanW7-GB - DFPGHaoTaiWangBeiW4 - - Gaegu-Regular + - Gaegu-Bold Flags: 00000000 Languages_Touch: [] - Term: Image/ui_button_icon_no_logo @@ -722,9 +722,9 @@ MonoBehaviour: Description: Languages: - ui_button_icon_Tasting_logo_gray - - Material_zh/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray[ui_button_icon_Tasting_logo_gray] - - Material_zh/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray[ui_button_icon_Tasting_logo_gray] - - Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray[ui_button_icon_Tasting_logo_gray] + - Material_zh/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_zh[ui_button_icon_Tasting_logo_gray_zh] + - Material_zh/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_zh[ui_button_icon_Tasting_logo_gray_zh] + - Material_ko/marketing/ProductManagement/ui_button_icon_Tasting_logo_gra_ko[ui_button_icon_Tasting_logo_gra_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_button_icon_cancel_logo @@ -6935,8 +6935,8 @@ MonoBehaviour: - "1\u3064\u306E\u30BF\u30F3\u30AF\u306B\u306F\u540C\u3058\u5473\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3057\u304B\n\u4FDD\u5B58\u3067\u304D\u306A\u3044\u304B\u3089\u6CE8\u610F\u3057\u3088\u3046\u306D" - "\u8981\u6CE8\u610F\u7684\u662F\u540C\u4E00\u4E2A\u98DF\u54C1\u7BB1\u91CC\u9762\u53EA\u80FD\u653E\u4E00\u79CD\u53E3\u5473\u7684\u7206\u7C73\u82B1\u54E6" - "\u8981\u8A3B\u610F\u7684\u662F\u540C\u4E00\u500B\u98DF\u54C1\u7BB1\u88CF\u9762\u53EA\u80FD\u653E\u4E00\u7A2E\u53E3\u5473\u7684\u7206\u7C73\u82B1\u54E6" - - "\uD55C \uD0F1\uD06C\uC5D0\uB294 \uAC19\uC740 \uB9DB\uC758 \uD31D\uCF58\uBC16\uC5D0\n - \uC800\uC7A5\uD560 \uC218 \uC5C6\uC73C\uB2C8 \uC8FC\uC758\uD558\uC138\uC694" + - "\uD55C \uD0F1\uD06C\uC5D0\uB294 \uAC19\uC740 \uB9DB\uC758 \uD31D\uCF58\uBC16\uC5D0\n\uC800\uC7A5\uD560 + \uC218 \uC5C6\uC73C\uB2C8 \uC8FC\uC758\uD558\uC138\uC694" Flags: 00000000 Languages_Touch: [] - Term: Script/BrotherScript20021 @@ -10224,6 +10224,7 @@ MonoBehaviour: - {fileID: 12800000, guid: b536e46feac1a4c829dd2cab3355da11, type: 3} - {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} - {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + - {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} Spreadsheet_LocalFileName: Spreadsheet_LocalCSVSeparator: ',' Spreadsheet_LocalCSVEncoding: utf-8