From dc26de5ba0ec97711bccfeb63e2561ccd70be782 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 23 May 2022 14:09:18 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/marketing/Customize.unity | 256 +++++++++++++++--- popcorn/Assets/Resources/I2Languages.asset | 20 +- 2 files changed, 231 insertions(+), 45 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index 28e81229..b3edd0fc 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -306,6 +306,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 52044466} m_CullTransparentMesh: 0 +--- !u!114 &101313755 +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: 227427382} --- !u!1 &110891699 GameObject: m_ObjectHideFlags: 0 @@ -464,7 +477,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -474,7 +487,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -524,12 +537,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 449.19 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -558,6 +571,30 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ae614796715fc949a96921656b66a62, type: 3} +--- !u!114 &227427382 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 &227427383 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!1 &238780954 GameObject: m_ObjectHideFlags: 0 @@ -828,7 +865,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -838,7 +875,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -888,12 +925,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -922,6 +959,30 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ae614796715fc949a96921656b66a62, type: 3} +--- !u!114 &336991182 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 &336991183 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 &339006504 GameObject: m_ObjectHideFlags: 0 @@ -1740,6 +1801,19 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 551709010} m_PrefabAsset: {fileID: 0} +--- !u!114 &562770564 +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: 811473978} --- !u!1 &601118649 GameObject: m_ObjectHideFlags: 0 @@ -2363,7 +2437,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2373,7 +2447,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2423,12 +2497,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1041.5701 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2457,6 +2531,30 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ae614796715fc949a96921656b66a62, type: 3} +--- !u!114 &811473977 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 &811473978 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 &822963519 GameObject: m_ObjectHideFlags: 0 @@ -2544,6 +2642,32 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &878977896 +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: 1428988153} +--- !u!114 &880891132 +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: 336991183} --- !u!1 &886883852 GameObject: m_ObjectHideFlags: 0 @@ -3148,19 +3272,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 2018038962} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &939605562 -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!114 &956104263 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3191,6 +3302,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6907007355767056341, guid: c09b0ac7c3f884dbc83ff9e348a6669b, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7703323260136806527, guid: c09b0ac7c3f884dbc83ff9e348a6669b, type: 3} propertyPath: m_RootOrder @@ -3630,6 +3746,19 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 956104263} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image +--- !u!114 &1175328084 +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: 227427383} --- !u!1 &1276255578 GameObject: m_ObjectHideFlags: 0 @@ -3889,7 +4018,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3899,7 +4028,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3949,12 +4078,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 745.38 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3983,6 +4112,30 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ae614796715fc949a96921656b66a62, type: 3} +--- !u!114 &1428988152 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 &1428988153 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 &1443084304 GameObject: m_ObjectHideFlags: 0 @@ -4036,6 +4189,32 @@ MonoBehaviour: button: {fileID: 930271091} onObject: {fileID: 959868501} offObject: {fileID: 930271088} +--- !u!114 &1471342469 +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: 811473977} +--- !u!114 &1531427680 +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: 1428988152} --- !u!114 &1538659930 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4369,12 +4548,6 @@ MonoBehaviour: button: {fileID: 904390283} onObject: {fileID: 2064821506} offObject: {fileID: 904390280} ---- !u!212 &1680411219 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, - type: 3} - m_PrefabInstance: {fileID: 6725113439449511083} - m_PrefabAsset: {fileID: 0} --- !u!114 &1680478608 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4655,6 +4828,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895333847} m_CullTransparentMesh: 0 +--- !u!114 &1897770324 +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: 336991182} --- !u!114 &2014261845 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 0f23a017..68f749ac 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -52,8 +52,8 @@ MonoBehaviour: Description: Languages: - marketing_background_Signboard - - 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/marketing/marketing_background_Signboard_zh[marketing_background_Signboard_zh] + - Material/marketing/marketing_background_Signboard_zh[marketing_background_Signboard_zh] - Material_ko/marketing/marketing_background_Signboard_ko[marketing_background_Signboard_ko] Flags: 00000000 Languages_Touch: [] @@ -82,8 +82,8 @@ MonoBehaviour: Description: Languages: - marketing_cart_logo_Dither - - Material_zh/marketing/marketing_cart_logo_zh_Dither[marketing_cart_logo_zh_Dither] - - Material_zh/marketing/marketing_cart_logo_zh_Dither[marketing_cart_logo_zh_Dither] + - Material/marketing/marketing_cart_logo_zh_Dither[marketing_cart_logo_zh_Dither] + - Material/marketing/marketing_cart_logo_zh_Dither[marketing_cart_logo_zh_Dither] - Material_ko/marketing/marketing_cart_logo_ko_Dither[marketing_cart_logo_ko_Dither] Flags: 00000000 Languages_Touch: [] @@ -11153,8 +11153,8 @@ MonoBehaviour: Description: Languages: - marketing_background_Signboard_Second - - - - + - Material/marketing/marketing_background_Signboard_Second_zh[marketing_background_Signboard_Second_zh] + - Material/marketing/marketing_background_Signboard_Second_zh[marketing_background_Signboard_Second_zh] - Flags: 00000000 Languages_Touch: [] @@ -11163,8 +11163,8 @@ MonoBehaviour: Description: Languages: - marketing_cart_logo_Second_Dither - - - - + - Material/marketing/marketing_cart_logo_Second_zh_Dither[marketing_cart_logo_Second_zh_Dither] + - Material/marketing/marketing_cart_logo_Second_zh_Dither[marketing_cart_logo_Second_zh_Dither] - Flags: 00000000 Languages_Touch: [] @@ -11173,8 +11173,8 @@ MonoBehaviour: Description: Languages: - 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] - Flags: 00000000 Languages_Touch: []