From 0d483b7d76af665dbbaeb5aca9a8ba3bfe5708ad Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 23 May 2022 12:16:30 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=82=BA=E7=94=BB=E5=83=8F=E3=81=82=E3=81=A6=E3=81=AF=E3=82=81?= =?UTF-8?q?=E9=80=94=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/marketing/Customize.unity | 208 +----------------- .../Customize/Item/_Decoration2.prefab | 1 + .../Prefabs/Customize/Item/_Signboard.prefab | 1 + popcorn/Assets/Resources/I2Languages.asset | 50 ++--- 4 files changed, 31 insertions(+), 229 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index ef13e3c4..28e81229 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -306,19 +306,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 52044466} m_CullTransparentMesh: 0 ---- !u!114 &79158882 -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: 2058534241} --- !u!1 &110891699 GameObject: m_ObjectHideFlags: 0 @@ -447,19 +434,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 0} ---- !u!114 &209112282 -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: 1791607513} --- !u!1001 &227427381 PrefabInstance: m_ObjectHideFlags: 0 @@ -1369,18 +1343,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 429811576} m_CullTransparentMesh: 0 ---- !u!114 &498016303 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62, - type: 3} - m_PrefabInstance: {fileID: 227427381} - 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 &501846075 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1853,30 +1815,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 601118649} m_CullTransparentMesh: 0 ---- !u!114 &630125264 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62, - type: 3} - m_PrefabInstance: {fileID: 1428988151} - 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 &641871196 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, - type: 3} - m_PrefabInstance: {fileID: 1428988151} - 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 &643926043 GameObject: m_ObjectHideFlags: 0 @@ -2090,7 +2028,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 0ad0c35e347f29e4dafe89c890bcbee6, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2906,19 +2844,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915074762} m_CullTransparentMesh: 0 ---- !u!114 &929372873 -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: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1680411219} --- !u!1 &930271088 GameObject: m_ObjectHideFlags: 0 @@ -3223,7 +3148,7 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 2018038962} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &946935151 +--- !u!114 &939605562 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3232,23 +3157,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: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1199331211} ---- !u!114 &951342957 -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: 498016303} + mTarget: {fileID: 1680411219} --- !u!114 &956104263 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3718,18 +3630,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 956104263} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &1199331211 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, - type: 3} - m_PrefabInstance: {fileID: 811473976} - 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 &1276255578 GameObject: m_ObjectHideFlags: 0 @@ -3959,19 +3859,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1380792731 -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: 641871196} --- !u!1001 &1428988151 PrefabInstance: m_ObjectHideFlags: 0 @@ -4149,18 +4036,6 @@ MonoBehaviour: button: {fileID: 930271091} onObject: {fileID: 959868501} offObject: {fileID: 930271088} ---- !u!114 &1448469452 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, - type: 3} - m_PrefabInstance: {fileID: 227427381} - 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 &1538659930 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4174,31 +4049,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 110891701} ---- !u!114 &1539035364 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62, - type: 3} - m_PrefabInstance: {fileID: 336991181} - 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 &1566697341 -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: 1448469452} --- !u!114 &1567492957 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4616,19 +4466,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1693567011} m_CullTransparentMesh: 0 ---- !u!114 &1711004213 -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: 630125264} --- !u!1 &1753840228 GameObject: m_ObjectHideFlags: 0 @@ -4725,31 +4562,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1791607513 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62, - type: 3} - m_PrefabInstance: {fileID: 811473976} - 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 &1812001520 -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: 1539035364} --- !u!4 &1826383572 stripped Transform: m_CorrespondingSourceObject: {fileID: 5209415119062664250, guid: 343971e948dfe44ddab5ab4f736c3f06, @@ -4869,18 +4681,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 938417939} ---- !u!114 &2058534241 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, - type: 3} - m_PrefabInstance: {fileID: 336991181} - 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 &2064821506 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Decoration2.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Decoration2.prefab index 9ce11ad9..1527d93a 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Decoration2.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Decoration2.prefab @@ -142,6 +142,7 @@ MonoBehaviour: AllowParameters: 1 TranslatedObjects: - {fileID: 21300000, guid: f46abf72670f570469e3612d368201be, type: 3} + - {fileID: 21300000, guid: abbe0aecf7003874fa43358e2e47abe7, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Signboard.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Signboard.prefab index c872044c..d4420f00 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Signboard.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Signboard.prefab @@ -110,6 +110,7 @@ MonoBehaviour: AllowLocalizedParameters: 1 AllowParameters: 1 TranslatedObjects: + - {fileID: 21300000, guid: e48b24a329cfd854aa083d0d01dfb7ed, type: 3} - {fileID: 21300000, guid: 4717ef924abc849e18f0fa060a7420d3, type: 3} LocalizeEvent: m_PersistentCalls: diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 2315b387..43c8be6a 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -51,9 +51,9 @@ MonoBehaviour: TermType: 5 Description: Languages: - - marketing_background_Signboard - - Material_zh/marketing/marketing_background_Signboard_zh[marketing_background_Signboard_zh] - - Material_zh/marketing/marketing_background_Signboard_zh[marketing_background_Signboard_zh] + - marketing_background_Signboard_EarlyType + - Material/marketing/marketing_background_Signboard_EarlyType_zh[marketing_background_Signboard_EarlyType_zh] + - Material/marketing/marketing_background_Signboard_EarlyType_zh[marketing_background_Signboard_EarlyType_zh] - Material_ko/marketing/marketing_background_Signboard_ko[marketing_background_Signboard_ko] Flags: 00000000 Languages_Touch: [] @@ -92,8 +92,8 @@ MonoBehaviour: Description: Languages: - marketing_cart_logo_EarlyType_Dither - - Material_zh/marketing/marketing_cart_logo_EarlyType_zh_Dither[marketing_cart_logo_EarlyType_zh_Dither] - - Material_zh/marketing/marketing_cart_logo_EarlyType_zh_Dither[marketing_cart_logo_EarlyType_zh_Dither] + - Material/marketing/marketing_cart_logo_EarlyType_zh_Dither[marketing_cart_logo_EarlyType_zh_Dither] + - Material/marketing/marketing_cart_logo_EarlyType_zh_Dither[marketing_cart_logo_EarlyType_zh_Dither] - Material_ko/marketing/marketing_cart_logo_EarlyType_ko_Dither[marketing_cart_logo_EarlyType_ko_Dither] Flags: 00000000 Languages_Touch: [] @@ -772,8 +772,8 @@ MonoBehaviour: Description: Languages: - ui_button_icon_completion_logo - - Material_zh/Main/Mission/ui_button_icon_completion_logo_zh[ui_button_icon_completion_logo_zh] - - Material_zh/Main/Mission/ui_button_icon_completion_logo_zh[ui_button_icon_completion_logo_zh] + - Material/marketing/Customize/ui_button_icon_completion_logo_zh[ui_button_icon_completion_logo_zh] + - Material/marketing/Customize/ui_button_icon_completion_logo_zh[ui_button_icon_completion_logo_zh] - Material_ko/Main/Mission/ui_button_icon_completion_logo_ko[ui_button_icon_completion_logo_ko] Flags: 00000000 Languages_Touch: [] @@ -1222,8 +1222,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_CustomizationDetails_title_text - - - - + - Material/marketing/Customize/ui_marketing_CustomizationDetails_title_text_zh[ui_marketing_CustomizationDetails_title_text_zh] + - Material/marketing/Customize/ui_marketing_CustomizationDetails_title_text_zh[ui_marketing_CustomizationDetails_title_text_zh] - Flags: 00000000 Languages_Touch: [] @@ -1232,8 +1232,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_button_icon_cart - - - - + - Material/marketing/Customize/ui_marketing_Customize_button_icon_cart_zh[ui_marketing_Customize_button_icon_cart_zh] + - Material/marketing/Customize/ui_marketing_Customize_button_icon_cart_zh[ui_marketing_Customize_button_icon_cart_zh] - Flags: 00000000 Languages_Touch: [] @@ -1242,8 +1242,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_button_icon_decoration_a - - - - + - Material/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_zh[ui_marketing_Customize_button_icon_decoration_a_zh] + - Material/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_zh[ui_marketing_Customize_button_icon_decoration_a_zh] - Flags: 00000000 Languages_Touch: [] @@ -1252,8 +1252,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_button_icon_decoration_b - - - - + - Material/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_zh[ui_marketing_Customize_button_icon_decoration_b_zh] + - Material/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_zh[ui_marketing_Customize_button_icon_decoration_b_zh] - Flags: 00000000 Languages_Touch: [] @@ -1262,8 +1262,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_button_icon_signboard - - - - + - Material/marketing/Customize/ui_marketing_Customize_button_icon_signboard_zh[ui_marketing_Customize_button_icon_signboard_zh] + - Material/marketing/Customize/ui_marketing_Customize_button_icon_signboard_zh[ui_marketing_Customize_button_icon_signboard_zh] - Flags: 00000000 Languages_Touch: [] @@ -1272,8 +1272,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_button_icon_stock - - - - + - Material/marketing/Customize/ui_marketing_Customize_button_icon_stock_zh[ui_marketing_Customize_button_icon_stock_zh] + - Material/marketing/Customize/ui_marketing_Customize_button_icon_stock_zh[ui_marketing_Customize_button_icon_stock_zh] - Flags: 00000000 Languages_Touch: [] @@ -1282,8 +1282,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_text_InPlace - - - - + - Material/marketing/Customize/ui_marketing_Customize_text_InPlace_zh[ui_marketing_Customize_text_InPlace_zh] + - Material/marketing/Customize/ui_marketing_Customize_text_InPlace_zh[ui_marketing_Customize_text_InPlace_zh] - Flags: 00000000 Languages_Touch: [] @@ -1292,8 +1292,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_text_release - - - - + - Material/marketing/Customize/ui_marketing_Customize_text_release_zh[ui_marketing_Customize_text_release_zh] + - Material/marketing/Customize/ui_marketing_Customize_text_release_zh[ui_marketing_Customize_text_release_zh] - Flags: 00000000 Languages_Touch: [] @@ -1302,8 +1302,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_title - - - - + - Material/marketing/Customize/ui_marketing_Customize_title_zh[ui_marketing_Customize_title_zh] + - Material/marketing/Customize/ui_marketing_Customize_title_zh[ui_marketing_Customize_title_zh] - Flags: 00000000 Languages_Touch: []