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/Resources/Material_zh/marketing/Customize/ui_button_icon_completion_logo_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/marketing/Customize/ui_button_icon_Customize_completion_logo_zh.png similarity index 100% rename from popcorn/Assets/MyGame/Resources/Material_zh/marketing/Customize/ui_button_icon_completion_logo_zh.png rename to popcorn/Assets/MyGame/Resources/Material_zh/marketing/Customize/ui_button_icon_Customize_completion_logo_zh.png diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/marketing/Customize/ui_button_icon_completion_logo_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/marketing/Customize/ui_button_icon_Customize_completion_logo_zh.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resources/Material_zh/marketing/Customize/ui_button_icon_completion_logo_zh.png.meta rename to popcorn/Assets/MyGame/Resources/Material_zh/marketing/Customize/ui_button_icon_Customize_completion_logo_zh.png.meta diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity index 2bc4c39a..4fa63c0f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity @@ -663,7 +663,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -675,7 +675,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u58F2\u5024\u30DC\u30FC\u30CA\u30B9" + m_Text: UI/SalesBonus --- !u!222 &293486477 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1215,7 +1215,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} + m_Sprite: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1759,7 +1759,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -1771,7 +1771,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5BA3\u4F1D\u306E\u52B9\u679C\u30A2\u30C3\u30D7" + m_Text: UI/AdWalkerBonus --- !u!222 &1048417437 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2183,7 +2183,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2195,7 +2195,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5916\u89B3\u30EC\u30D9\u30EB" + m_Text: UI/InfoShopCustomizeLevel --- !u!222 &1181495076 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2301,7 +2301,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2313,7 +2313,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" --- !u!222 &1185689759 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2595,7 +2595,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2607,7 +2607,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u304A\u5BA2\u3055\u3093\u306E\u6570\u30A2\u30C3\u30D7" + m_Text: UI/CustomerBonus --- !u!222 &1367586358 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index b3edd0fc..f5b673d4 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -306,7 +306,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 52044466} m_CullTransparentMesh: 0 ---- !u!114 &101313755 +--- !u!114 &88602207 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -318,7 +318,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 227427382} + mTarget: {fileID: 811473978} --- !u!1 &110891699 GameObject: m_ObjectHideFlags: 0 @@ -376,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 @@ -447,6 +447,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 0} +--- !u!114 &193308734 +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!1001 &227427381 PrefabInstance: m_ObjectHideFlags: 0 @@ -454,6 +467,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 693515230} m_Modifications: + - target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, + type: 3} + - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, + type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Pivot.x @@ -842,6 +867,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 693515230} m_Modifications: + - target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, + type: 3} + - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, + type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Pivot.x @@ -1190,6 +1227,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 0} +--- !u!114 &399246989 +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 &404654492 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1801,19 +1851,6 @@ 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 @@ -2100,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 @@ -2336,7 +2373,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1b1f56cd08f942645b331422171b2269, type: 3} + m_Sprite: {fileID: 21300000, guid: 6f0a500417be752498171074be3519e7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2414,6 +2451,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 693515230} m_Modifications: + - target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, + type: 3} + - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, + type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Pivot.x @@ -2642,32 +2691,6 @@ 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 @@ -3214,7 +3237,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 @@ -3631,6 +3654,19 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!114 &1063925961 +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!1 &1084709692 GameObject: m_ObjectHideFlags: 0 @@ -3688,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 @@ -3746,19 +3782,6 @@ 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 @@ -3988,6 +4011,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1388747217 +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!1001 &1428988151 PrefabInstance: m_ObjectHideFlags: 0 @@ -3995,6 +4031,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 693515230} m_Modifications: + - target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, + type: 3} + - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, + type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Pivot.x @@ -4189,32 +4237,6 @@ 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 @@ -4315,6 +4337,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1592747031} m_CullTransparentMesh: 0 +--- !u!114 &1617702316 +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 &1618662803 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3836306740968186770, guid: 343971e948dfe44ddab5ab4f736c3f06, @@ -4437,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 @@ -4741,6 +4776,19 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6725113439449511083} m_PrefabAsset: {fileID: 0} +--- !u!114 &1826487375 +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 &1861500674 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4754,6 +4802,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 662552816} +--- !u!114 &1865387382 +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 &1895333847 GameObject: m_ObjectHideFlags: 0 @@ -4828,19 +4889,6 @@ 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 @@ -4867,6 +4915,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 938417939} +--- !u!114 &2053246402 +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!1 &2064821506 GameObject: m_ObjectHideFlags: 0 @@ -5318,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 @@ -5349,12 +5410,11 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d2e4ae50bfa33574dbf61988d91f2634, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: m_WasSpriteAssigned - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5124423628195254865, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} @@ -5450,6 +5510,12 @@ PrefabInstance: type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} +--- !u!212 &6725113439449511084 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + m_PrefabInstance: {fileID: 6725113439449511083} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7213633219263105217 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab index 4fc0d938..8e4465d7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab @@ -296,7 +296,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da, type: 3} + m_Sprite: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 54438b27..4b28ce34 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -762,8 +762,8 @@ MonoBehaviour: Description: Languages: - ui_button_icon_close_logo_small - - Material/shopping/ui_button_icon_close_logo_small_zh[ui_button_icon_close_logo_small_zh] - - Material/shopping/ui_button_icon_close_logo_small_zh[ui_button_icon_close_logo_small_zh] + - Material_zh/shopping/ui_button_icon_close_logo_small_zh[ui_button_icon_close_logo_small_zh] + - Material_zh/shopping/ui_button_icon_close_logo_small_zh[ui_button_icon_close_logo_small_zh] - Material_ko/shopping/ui_button_icon_close_logo_small_ko[ui_button_icon_close_logo_small_ko] Flags: 00000000 Languages_Touch: [] @@ -771,9 +771,9 @@ MonoBehaviour: TermType: 5 Description: Languages: - - ui_button_icon_completion_logo - - 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] + - ui_button_icon_Customize_completion_logo + - Material_zh/marketing/Customize/ui_button_icon_Customize_completion_logo_zh[ui_button_icon_Customize_completion_logo_zh] + - Material_zh/marketing/Customize/ui_button_icon_Customize_completion_logo_zh[ui_button_icon_Customize_completion_logo_zh] - Material_ko/Main/Mission/ui_button_icon_completion_logo_ko[ui_button_icon_completion_logo_ko] Flags: 00000000 Languages_Touch: [] @@ -892,8 +892,8 @@ MonoBehaviour: Description: Languages: - ui_button_icon_purchase_logo - - Material/shopping/ui_button_icon_purchase_logo_zh[ui_button_icon_purchase_logo_zh] - - Material/shopping/ui_button_icon_purchase_logo_zh[ui_button_icon_purchase_logo_zh] + - Material_zh/shopping/ui_button_icon_purchase_logo_zh[ui_button_icon_purchase_logo_zh] + - Material_zh/shopping/ui_button_icon_purchase_logo_zh[ui_button_icon_purchase_logo_zh] - Material_ko/shopping/ui_button_icon_purchase_logo_ko[ui_button_icon_purchase_logo_ko] Flags: 00000000 Languages_Touch: [] @@ -902,8 +902,8 @@ MonoBehaviour: Description: Languages: - ui_button_icon_purchase_logo_gray - - Material/shopping/ui_button_icon_purchase_logo_gray_zh[ui_button_icon_purchase_logo_gray_zh] - - Material/shopping/ui_button_icon_purchase_logo_gray_zh[ui_button_icon_purchase_logo_gray_zh] + - Material_zh/shopping/ui_button_icon_purchase_logo_gray_zh[ui_button_icon_purchase_logo_gray_zh] + - Material_zh/shopping/ui_button_icon_purchase_logo_gray_zh[ui_button_icon_purchase_logo_gray_zh] - Material_ko/shopping/ui_button_icon_purchase_logo_gray_ko[ui_button_icon_purchase_logo_gray_ko] Flags: 00000000 Languages_Touch: [] @@ -972,8 +972,8 @@ MonoBehaviour: Description: Languages: - ui_button_icon_stop_logo - - Material/Main/recipe/ui_button_icon_stop_logo_zh[ui_button_icon_stop_logo_zh] - - Material/Main/recipe/ui_button_icon_stop_logo_zh[ui_button_icon_stop_logo_zh] + - Material_zh/Main/recipe/ui_button_icon_stop_logo_zh[ui_button_icon_stop_logo_zh] + - Material_zh/Main/recipe/ui_button_icon_stop_logo_zh[ui_button_icon_stop_logo_zh] - Material_ko/Main/recipe/ui_button_icon_stop_logo_ko[ui_button_icon_stop_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] + - Material_zh/marketing/Customize/ui_marketing_CustomizationDetails_title_text_zh[ui_marketing_CustomizationDetails_title_text_zh] + - Material_zh/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] + - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_cart_zh[ui_marketing_Customize_button_icon_cart_zh] + - Material_zh/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] + - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_zh[ui_marketing_Customize_button_icon_decoration_a_zh] + - Material_zh/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] + - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_zh[ui_marketing_Customize_button_icon_decoration_b_zh] + - Material_zh/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] + - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_signboard_zh[ui_marketing_Customize_button_icon_signboard_zh] + - Material_zh/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] + - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_stock_zh[ui_marketing_Customize_button_icon_stock_zh] + - Material_zh/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] + - Material_zh/marketing/Customize/ui_marketing_Customize_text_InPlace_zh[ui_marketing_Customize_text_InPlace_zh] + - Material_zh/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] + - Material_zh/marketing/Customize/ui_marketing_Customize_text_release_zh[ui_marketing_Customize_text_release_zh] + - Material_zh/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] + - Material_zh/marketing/Customize/ui_marketing_Customize_title_zh[ui_marketing_Customize_title_zh] + - Material_zh/marketing/Customize/ui_marketing_Customize_title_zh[ui_marketing_Customize_title_zh] - Flags: 00000000 Languages_Touch: [] @@ -11073,8 +11073,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_signboard_a - - Material/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_zh[ui_marketing_Customize_icon_signboard_a_zh] - - Material/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_zh[ui_marketing_Customize_icon_signboard_a_zh] + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_zh[ui_marketing_Customize_icon_signboard_a_zh] + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_zh[ui_marketing_Customize_icon_signboard_a_zh] - Flags: 00000000 Languages_Touch: [] @@ -11083,8 +11083,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_explanation_text_Dither - - Material/marketing/Customize/ui_marketing_Customize_explanation_text_zh_Dither[ui_marketing_Customize_explanation_text_zh_Dither] - - Material/marketing/Customize/ui_marketing_Customize_explanation_text_zh_Dither[ui_marketing_Customize_explanation_text_zh_Dither] + - Material_zh/marketing/Customize/ui_marketing_Customize_explanation_text_zh_Dither[ui_marketing_Customize_explanation_text_zh_Dither] + - Material_zh/marketing/Customize/ui_marketing_Customize_explanation_text_zh_Dither[ui_marketing_Customize_explanation_text_zh_Dither] - Flags: 00000000 Languages_Touch: [] @@ -11093,8 +11093,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_explanation_title - - Material/marketing/Customize/ui_marketing_Customize_explanation_title_zh[ui_marketing_Customize_explanation_title_zh] - - Material/marketing/Customize/ui_marketing_Customize_explanation_title_zh[ui_marketing_Customize_explanation_title_zh] + - Material_zh/marketing/Customize/ui_marketing_Customize_explanation_title_zh[ui_marketing_Customize_explanation_title_zh] + - Material_zh/marketing/Customize/ui_marketing_Customize_explanation_title_zh[ui_marketing_Customize_explanation_title_zh] - Flags: 00000000 Languages_Touch: []