diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/Customize/ui_button_icon_completion_logo.png b/popcorn/Assets/MyGame/Resource/Material/marketing/Customize/ui_button_icon_Customize_completion_logo.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/marketing/Customize/ui_button_icon_completion_logo.png rename to popcorn/Assets/MyGame/Resource/Material/marketing/Customize/ui_button_icon_Customize_completion_logo.png diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/Customize/ui_button_icon_completion_logo.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/Customize/ui_button_icon_Customize_completion_logo.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/marketing/Customize/ui_button_icon_completion_logo.png.meta rename to popcorn/Assets/MyGame/Resource/Material/marketing/Customize/ui_button_icon_Customize_completion_logo.png.meta diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index a00a3aa3..e00a4ccf 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -187,6 +187,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &47616037 +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!1 &52044466 GameObject: m_ObjectHideFlags: 0 @@ -363,7 +376,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4dfd13c469869964ca6f7bfef8074cb4, type: 3} + m_Sprite: {fileID: 21300000, guid: ffe86a22810984b40aee43304c4fd22d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -434,6 +447,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 0} +--- !u!114 &223877072 +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!1001 &227427381 PrefabInstance: m_ObjectHideFlags: 0 @@ -445,13 +471,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59, + objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da, + objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -845,13 +871,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59, + objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da, + objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1069,6 +1095,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 339006504} m_CullTransparentMesh: 0 +--- !u!114 &349546746 +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 &355133276 GameObject: m_ObjectHideFlags: 0 @@ -1415,32 +1454,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 429811576} m_CullTransparentMesh: 0 ---- !u!114 &483465779 -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: 6725113439449511084} ---- !u!114 &489700872 -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 &501846075 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2124,7 +2137,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0ad0c35e347f29e4dafe89c890bcbee6, type: 3} + m_Sprite: {fileID: 21300000, guid: 0957b3cc90c258942a7378a9a68c6e25, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2418,19 +2431,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 1680478608} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &765913230 -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!114 &776291670 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2455,13 +2455,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59, + objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da, + objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2691,6 +2691,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &847652601 +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 @@ -2991,19 +3004,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915074762} m_CullTransparentMesh: 0 ---- !u!114 &920475811 -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!1 &930271088 GameObject: m_ObjectHideFlags: 0 @@ -3250,7 +3250,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4c0bd2ebfc1050249957c8c7ee4f436f, type: 3} + m_Sprite: {fileID: 21300000, guid: 0f0277a921c33c24b903cf4a8d7f4b4d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3724,7 +3724,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1033b578a6c824947b690e34f2c4a9ca, type: 3} + m_Sprite: {fileID: 21300000, guid: 6434ba4341046884fb2ead24b4c8dfad, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3782,6 +3782,19 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 956104263} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image +--- !u!114 &1188153442 +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!1 &1276255578 GameObject: m_ObjectHideFlags: 0 @@ -4011,32 +4024,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1387507841 -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 &1421069203 -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!1001 &1428988151 PrefabInstance: m_ObjectHideFlags: 0 @@ -4048,13 +4035,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59, + objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da, + objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -4250,6 +4237,19 @@ MonoBehaviour: button: {fileID: 930271091} onObject: {fileID: 959868501} offObject: {fileID: 930271088} +--- !u!114 &1444099355 +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!114 &1538659930 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4350,19 +4350,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1592747031} m_CullTransparentMesh: 0 ---- !u!114 &1595212496 -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!114 &1618662803 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3836306740968186770, guid: 343971e948dfe44ddab5ab4f736c3f06, @@ -4485,7 +4472,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5dfff996c6f85fb4fbb990dbc1abe1b4, type: 3} + m_Sprite: {fileID: 21300000, guid: 584a15ae3ffc0f64fb8d70476cedb7f8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4596,7 +4583,20 @@ MonoBehaviour: button: {fileID: 904390283} onObject: {fileID: 2064821506} offObject: {fileID: 904390280} ---- !u!114 &1673729061 +--- !u!114 &1663699133 +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: 6725113439449511084} +--- !u!114 &1669795885 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4608,7 +4608,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 227427382} + mTarget: {fileID: 1428988153} --- !u!114 &1680478608 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4802,19 +4802,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6725113439449511083} m_PrefabAsset: {fileID: 0} ---- !u!114 &1829026907 -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!114 &1861500674 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4928,6 +4915,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 938417939} +--- !u!114 &2044183130 +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 &2064821506 GameObject: m_ObjectHideFlags: 0 @@ -5379,7 +5379,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5a0d094578640fa45953e89871854fb3, type: 3} + m_Sprite: {fileID: 21300000, guid: 4d2123d1f14068b41910700aab2525d5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5410,7 +5410,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d2e4ae50bfa33574dbf61988d91f2634, + objectReference: {fileID: 21300000, guid: d777942e8381b48d48b282ceb6a85cd6, type: 3} - target: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 78fe1127..01a4054b 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -11182,7 +11182,7 @@ MonoBehaviour: TermType: 5 Description: Languages: - - ui_button_icon_completion_logo + - ui_button_icon_Customize_completion_logo - - -