diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_cart_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_cart_ko.png index d93ac2e2..dccf428d 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_cart_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_cart_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_ko.png index 3fa91522..2b868d2d 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_ko.png index fc21e5d8..062ae252 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_signboard_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_signboard_ko.png index 4cb60c22..b9f4a248 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_signboard_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_signboard_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_stock_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_stock_ko.png index e27de09a..85ccbea9 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_stock_ko.png and b/popcorn/Assets/MyGame/Resources/Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_stock_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab index b00e784a..0adf8e01 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab @@ -121,7 +121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 42bb7c9b58b76fc49985e5386d09f4b1, + objectReference: {fileID: 21300000, guid: 3a4f1ff280f947a4a9880e2bf8460161, type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_b.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_b.prefab index e1088af2..dfeccdf2 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_b.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_b.prefab @@ -121,7 +121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ab2573ad8f792f444944f9e6fb32e8f7, + objectReference: {fileID: 21300000, guid: 8abd4ebb76e37354299e3cc6dc321af3, type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_c.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_c.prefab index b1eeee0e..3056817b 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_c.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_c.prefab @@ -121,7 +121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b1570cc0a0983ab499a80796a9994c5a, + objectReference: {fileID: 21300000, guid: b6ad4c4fbf8baff40a9ea30f916976ff, type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab index 26d29568..a875cd4b 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab @@ -121,7 +121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f432f51dd06578a488132f99f07c2c5d, + objectReference: {fileID: 21300000, guid: e48b24a329cfd854aa083d0d01dfb7ed, type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_c.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_c.prefab index d3f5363d..454c7387 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_c.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_c.prefab @@ -121,7 +121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e37aebdaa6be093419f13bb4e4bbf44f, + objectReference: {fileID: 21300000, guid: afe878d3831c48142b5f235151719f38, type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity index 4fa63c0f..9323c9fe 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity @@ -286,9 +286,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ac590bcc9d962fc468c63e78856a1e4d, type: 3} + m_Sprite: {fileID: 21300000, guid: a1d3115a8e6c0d54eb4d6668c15fffd5, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -675,7 +675,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: UI/SalesBonus + m_Text: "\u552E\u4EF7\u5956\u52B1" --- !u!222 &293486477 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1771,7 +1771,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: UI/AdWalkerBonus + m_Text: "\u5BA3\u4F20\u6548\u679C\u589E\u52A0" --- !u!222 &1048417437 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2195,7 +2195,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: UI/InfoShopCustomizeLevel + m_Text: "\u5916\u89C2\u7B49\u7EA7" --- !u!222 &1181495076 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2607,7 +2607,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: UI/CustomerBonus + m_Text: "\u83B7\u5BA2\u91CF\u589E\u52A0" --- !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 0e07f7ad..ef600cea 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -187,18 +187,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &47983356 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!1 &52044466 GameObject: m_ObjectHideFlags: 0 @@ -318,18 +306,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 52044466} m_CullTransparentMesh: 0 ---- !u!114 &56714025 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!1 &110891699 GameObject: m_ObjectHideFlags: 0 @@ -366,7 +342,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -2.2} - m_SizeDelta: {x: 194, y: 90} + m_SizeDelta: {x: 206, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &110891701 MonoBehaviour: @@ -387,9 +363,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ffe86a22810984b40aee43304c4fd22d, type: 3} + m_Sprite: {fileID: 21300000, guid: 0e085521ac2669a4da2d38a4d8482a9e, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -445,18 +421,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 1538659930} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &124984245 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!114 &134216885 MonoBehaviour: m_ObjectHideFlags: 0 @@ -470,7 +434,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 0} ---- !u!114 &206438464 +--- !u!114 &169151089 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -482,7 +446,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 47983356} + mTarget: {fileID: 227427382} --- !u!1001 &227427381 PrefabInstance: m_ObjectHideFlags: 0 @@ -494,13 +458,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, + objectReference: {fileID: 21300000, guid: 6e634d5b49eb5c74ab8cf49853e31d02, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, + objectReference: {fileID: 21300000, guid: ea5f155c3ba47104f8aa84b59f318924, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -525,7 +489,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -535,7 +499,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -585,12 +549,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 449.19 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -619,6 +583,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 @@ -723,31 +711,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3ad134b74850c4ce4b72ff15afadfabd, type: 3} ---- !u!114 &264528993 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 &281994623 -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: 478487828} --- !u!212 &293313977 stripped SpriteRenderer: m_CorrespondingSourceObject: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, @@ -901,13 +864,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, + objectReference: {fileID: 21300000, guid: 6e634d5b49eb5c74ab8cf49853e31d02, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, + objectReference: {fileID: 21300000, guid: ea5f155c3ba47104f8aa84b59f318924, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -932,7 +895,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -942,7 +905,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -992,12 +955,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 153 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1026,6 +989,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 @@ -1447,18 +1434,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 429811576} m_CullTransparentMesh: 0 ---- !u!114 &478487828 stripped +--- !u!114 &439996222 MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, - type: 3} - m_PrefabInstance: {fileID: 811473976} + 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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: + mTarget: {fileID: 1428988152} --- !u!114 &501846075 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1657,7 +1645,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 5dfff996c6f85fb4fbb990dbc1abe1b4, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1686,19 +1674,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 681206122} ---- !u!114 &549561502 -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: 264528993} --- !u!1001 &551709010 PrefabInstance: m_ObjectHideFlags: 0 @@ -2082,7 +2057,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 4dfd13c469869964ca6f7bfef8074cb4, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2155,7 +2130,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0957b3cc90c258942a7378a9a68c6e25, type: 3} + m_Sprite: {fileID: 21300000, guid: c13b73b8589caa249a6334a765df4f42, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2312,7 +2287,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 1033b578a6c824947b690e34f2c4a9ca, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2370,7 +2345,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: 114, y: 54} + m_SizeDelta: {x: 118, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &695678468 MonoBehaviour: @@ -2391,9 +2366,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6f0a500417be752498171074be3519e7, type: 3} + m_Sprite: {fileID: 21300000, guid: 5287c7947a30b6d4fbf8a716591cc8ce, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2462,18 +2437,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 527833883} ---- !u!114 &800354489 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!1001 &811473976 PrefabInstance: m_ObjectHideFlags: 0 @@ -2485,13 +2448,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, + objectReference: {fileID: 21300000, guid: 6e634d5b49eb5c74ab8cf49853e31d02, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, + objectReference: {fileID: 21300000, guid: ea5f155c3ba47104f8aa84b59f318924, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2516,7 +2479,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2526,7 +2489,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2576,12 +2539,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 1041.5701 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2610,6 +2573,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 @@ -2697,31 +2684,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &852747172 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 &868097200 -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: 852747172} --- !u!1 &886883852 GameObject: m_ObjectHideFlags: 0 @@ -3022,6 +2984,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915074762} m_CullTransparentMesh: 0 +--- !u!114 &925236225 +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 &930271088 GameObject: m_ObjectHideFlags: 0 @@ -3247,7 +3222,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -2.2} - m_SizeDelta: {x: 194, y: 90} + m_SizeDelta: {x: 206, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &938417939 MonoBehaviour: @@ -3268,9 +3243,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0f0277a921c33c24b903cf4a8d7f4b4d, type: 3} + m_Sprite: {fileID: 21300000, guid: 2e54a13649abe3440a66d8b6f25f269d, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3592,7 +3567,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 4c0bd2ebfc1050249957c8c7ee4f436f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3608,19 +3583,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1028508433} m_CullTransparentMesh: 0 ---- !u!114 &1037106489 -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: 56714025} --- !u!1 &1059209560 GameObject: m_ObjectHideFlags: 0 @@ -3734,7 +3696,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -2.2} - m_SizeDelta: {x: 194, y: 90} + m_SizeDelta: {x: 206, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1084709694 MonoBehaviour: @@ -3755,9 +3717,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6434ba4341046884fb2ead24b4c8dfad, type: 3} + m_Sprite: {fileID: 21300000, guid: 059d3d7aa066a1343a402a26a86f3ac9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3813,19 +3775,7 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 956104263} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &1125966044 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!114 &1127426666 +--- !u!114 &1088469016 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3837,7 +3787,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 800354489} + mTarget: {fileID: 336991182} +--- !u!114 &1229003745 +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 &1276255578 GameObject: m_ObjectHideFlags: 0 @@ -4078,13 +4041,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, + objectReference: {fileID: 21300000, guid: 6e634d5b49eb5c74ab8cf49853e31d02, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, + objectReference: {fileID: 21300000, guid: ea5f155c3ba47104f8aa84b59f318924, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -4109,7 +4072,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -4119,7 +4082,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -4169,12 +4132,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 745.38 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -4203,6 +4166,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 @@ -4256,19 +4243,6 @@ MonoBehaviour: button: {fileID: 930271091} onObject: {fileID: 959868501} offObject: {fileID: 930271088} ---- !u!114 &1538333736 -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: 124984245} --- !u!114 &1538659930 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4295,6 +4269,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1028508436} +--- !u!114 &1586132743 +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 &1592747031 GameObject: m_ObjectHideFlags: 0 @@ -4470,7 +4457,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -2.2} - m_SizeDelta: {x: 194, y: 90} + m_SizeDelta: {x: 206, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1657044927 MonoBehaviour: @@ -4491,9 +4478,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 584a15ae3ffc0f64fb8d70476cedb7f8, type: 3} + m_Sprite: {fileID: 21300000, guid: 70e8d2c2ed46bdc46a0831e6f5543ff5, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -4789,12 +4776,38 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1771898120 +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: 293313977} --- !u!4 &1826383572 stripped Transform: m_CorrespondingSourceObject: {fileID: 5209415119062664250, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} m_PrefabInstance: {fileID: 6725113439449511083} m_PrefabAsset: {fileID: 0} +--- !u!114 &1832418371 +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 @@ -4882,32 +4895,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895333847} m_CullTransparentMesh: 0 ---- !u!114 &1941027083 -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: 293313977} ---- !u!114 &1986756981 -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: 1125966044} --- !u!114 &2014261845 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5206,6 +5193,19 @@ MonoBehaviour: scrollRect: {fileID: 2083561337} verticalSlider: {fileID: 429811578} direction: 0 +--- !u!114 &2090955682 +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!1 &1135563714249534642 GameObject: m_ObjectHideFlags: 0 @@ -5282,7 +5282,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4.7} - m_SizeDelta: {x: 194, y: 90} + m_SizeDelta: {x: 206, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &3099811789230852685 PrefabInstance: @@ -5385,9 +5385,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4d2123d1f14068b41910700aab2525d5, type: 3} + m_Sprite: {fileID: 21300000, guid: b26c0957338ba9d47a7ac4f83c3f4cfb, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -5416,11 +5416,12 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: edd70ddee1c13db4daab79460d608f70, + type: 3} - target: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: m_WasSpriteAssigned - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5124423628195254865, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} @@ -6246,7 +6247,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 5a0d094578640fa45953e89871854fb3, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity index 2122070c..2b8330a2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity @@ -178,7 +178,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c6689bcf32023ee4e8eccc786b0d615b, type: 3} + m_Sprite: {fileID: 21300000, guid: 879cff1e1acde304582285dbe37d6869, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -669,7 +669,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} + m_Sprite: {fileID: 21300000, guid: 2e49fdaafc2cfe945bdf05d4acdc97f3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -904,7 +904,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -8} - m_SizeDelta: {x: 480, y: 82} + m_SizeDelta: {x: 530, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1687945084 MonoBehaviour: @@ -925,9 +925,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5e43fecf5be6a604baf871877445d4a4, type: 3} + m_Sprite: {fileID: 21300000, guid: 1c5f6ed2647d5a24b98c16d190ec265b, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 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 8e4465d7..945ed8c5 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab @@ -598,7 +598,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59, type: 3} + m_Sprite: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, 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 993ec4be..34cbd7fc 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -64,7 +64,7 @@ MonoBehaviour: - marketing_background_Signboard_EarlyType - Material_zh/marketing/marketing_background_Signboard_EarlyType_zh[marketing_background_Signboard_EarlyType_zh] - Material_zh/marketing/marketing_background_Signboard_EarlyType_zh[marketing_background_Signboard_EarlyType_zh] - - + - Material_ko/marketing/marketing_background_Signboard_EarlyType_ko[marketing_background_Signboard_EarlyType_ko] Flags: 00000000 Languages_Touch: [] - Term: marketing_background_Signboard_Second @@ -74,7 +74,7 @@ MonoBehaviour: - marketing_background_Signboard_Second - Material_zh/marketing/marketing_background_Signboard_Second_zh[marketing_background_Signboard_Second_zh] - Material_zh/marketing/marketing_background_Signboard_Second_zh[marketing_background_Signboard_Second_zh] - - + - Material_ko/marketing/marketing_background_Signboard_Second_ko[marketing_background_Signboard_Second_ko] Flags: 00000000 Languages_Touch: [] - Term: marketing_background_Signboard_Tasting @@ -124,7 +124,7 @@ MonoBehaviour: - marketing_cart_logo_Second_Dither - Material_zh/marketing/marketing_cart_logo_Second_zh_Dither[marketing_cart_logo_Second_zh_Dither] - Material_zh/marketing/marketing_cart_logo_Second_zh_Dither[marketing_cart_logo_Second_zh_Dither] - - + - Material_ko/marketing/marketing_cart_logo_Second_ko_Dither[marketing_cart_logo_Second_ko_Dither] Flags: 00000000 Languages_Touch: [] - Term: shopping_background_title_logo @@ -1104,7 +1104,7 @@ MonoBehaviour: - ui_marketing_CustomizationDetails_title_text - 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] - - + - Material_ko/marketing/Customize/ui_marketing_CustomizationDetails_title_text_ko[ui_marketing_CustomizationDetails_title_text_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_button_icon_cart @@ -1114,7 +1114,7 @@ MonoBehaviour: - ui_marketing_Customize_button_icon_cart - 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] - - + - Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_cart_ko[ui_marketing_Customize_button_icon_cart_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_button_icon_decoration_a @@ -1124,7 +1124,7 @@ MonoBehaviour: - ui_marketing_Customize_button_icon_decoration_a - 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] - - + - Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_ko[ui_marketing_Customize_button_icon_decoration_a_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_button_icon_decoration_b @@ -1134,7 +1134,7 @@ MonoBehaviour: - ui_marketing_Customize_button_icon_decoration_b - 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] - - + - Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_ko[ui_marketing_Customize_button_icon_decoration_b_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_button_icon_signboard @@ -1144,7 +1144,7 @@ MonoBehaviour: - ui_marketing_Customize_button_icon_signboard - 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] - - + - Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_signboard_ko[ui_marketing_Customize_button_icon_signboard_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_button_icon_stock @@ -1154,7 +1154,7 @@ MonoBehaviour: - ui_marketing_Customize_button_icon_stock - 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] - - + - Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_stock_ko[ui_marketing_Customize_button_icon_stock_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_explanation_text_Dither @@ -1164,7 +1164,7 @@ MonoBehaviour: - ui_marketing_Customize_explanation_text_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] - - + - Material_ko/marketing/Customize/ui_marketing_Customize_explanation_text_ko_Dither[ui_marketing_Customize_explanation_text_ko_Dither] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_explanation_title @@ -1173,8 +1173,8 @@ MonoBehaviour: Languages: - ui_marketing_Customize_explanation_title - 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] + - Material_ko/marketing/Customize/ui_marketing_Customize_explanation_title_ko[ui_marketing_Customize_explanation_title_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_icon_decoration2_a @@ -1182,9 +1182,9 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_decoration2_a - - Material_zh/marketing/Customize/ui_marketing_Customize_icon_decoration2_a_zh[ui_marketing_Customize_icon_decoration2_a_zh] - - Material_zh/marketing/Customize/ui_marketing_Customize_icon_decoration2_a_zh[ui_marketing_Customize_icon_decoration2_a_zh] - - + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_zh[ui_marketing_Customize_icon_decoration2_a_zh] + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_zh[ui_marketing_Customize_icon_decoration2_a_zh] + - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_ko[ui_marketing_Customize_icon_decoration2_a_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_icon_decoration2_b @@ -1192,9 +1192,9 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_decoration2_b - - Material_zh/marketing/Customize/ui_marketing_Customize_icon_decoration2_b_zh[ui_marketing_Customize_icon_decoration2_b_zh] - - Material_zh/marketing/Customize/ui_marketing_Customize_icon_decoration2_b_zh[ui_marketing_Customize_icon_decoration2_b_zh] - - + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_zh[ui_marketing_Customize_icon_decoration2_b_zh] + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_zh[ui_marketing_Customize_icon_decoration2_b_zh] + - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_ko[ui_marketing_Customize_icon_decoration2_b_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_icon_decoration2_c @@ -1202,9 +1202,9 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_decoration2_c - - Material_zh/marketing/Customize/ui_marketing_Customize_icon_decoration2_c_zh[ui_marketing_Customize_icon_decoration2_c_zh] - - Material_zh/marketing/Customize/ui_marketing_Customize_icon_decoration2_c_zh[ui_marketing_Customize_icon_decoration2_c_zh] - - + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_zh[ui_marketing_Customize_icon_decoration2_c_zh] + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_zh[ui_marketing_Customize_icon_decoration2_c_zh] + - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_ko[ui_marketing_Customize_icon_decoration2_c_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_icon_signboard_a @@ -1212,9 +1212,9 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_signboard_a - - Material_zh/marketing/Customize/ui_marketing_Customize_icon_signboard_a_zh[ui_marketing_Customize_icon_signboard_a_zh] - - Material_zh/marketing/Customize/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] + - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_ko[ui_marketing_Customize_icon_signboard_a_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_icon_signboard_b @@ -1222,9 +1222,9 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_signboard_b - - Material_zh/marketing/Customize/ui_marketing_Customize_icon_signboard_b_zh[ui_marketing_Customize_icon_signboard_b_zh] - - Material_zh/marketing/Customize/ui_marketing_Customize_icon_signboard_b_zh[ui_marketing_Customize_icon_signboard_b_zh] - - + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_zh[ui_marketing_Customize_icon_signboard_b_zh] + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_zh[ui_marketing_Customize_icon_signboard_b_zh] + - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_ko[ui_marketing_Customize_icon_signboard_b_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_icon_signboard_c @@ -1232,9 +1232,9 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_signboard_c - - Material_zh/marketing/Customize/ui_marketing_Customize_icon_signboard_c_zh[ui_marketing_Customize_icon_signboard_c_zh] - - Material_zh/marketing/Customize/ui_marketing_Customize_icon_signboard_c_zh[ui_marketing_Customize_icon_signboard_c_zh] - - + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_zh[ui_marketing_Customize_icon_signboard_c_zh] + - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_zh[ui_marketing_Customize_icon_signboard_c_zh] + - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_ko[ui_marketing_Customize_icon_signboard_c_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_text_InPlace @@ -1244,7 +1244,7 @@ MonoBehaviour: - ui_marketing_Customize_text_InPlace - 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] - - + - Material_ko/marketing/Customize/ui_marketing_Customize_text_InPlace_ko[ui_marketing_Customize_text_InPlace_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_text_release @@ -1254,7 +1254,7 @@ MonoBehaviour: - ui_marketing_Customize_text_release - 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] - - + - Material_ko/marketing/Customize/ui_marketing_Customize_text_release_ko[ui_marketing_Customize_text_release_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_Customize_title @@ -1264,7 +1264,7 @@ MonoBehaviour: - ui_marketing_Customize_title - 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] - - + - Material_ko/marketing/Customize/ui_marketing_Customize_title_ko[ui_marketing_Customize_title_ko] Flags: 00000000 Languages_Touch: [] - Term: ui_marketing_ProductManagement_Tasting_text @@ -11180,6 +11180,16 @@ MonoBehaviour: - "\uD0B9 \uC624\uBE0C \uD31D\uCF58" Flags: 00000000 Languages_Touch: [] + - Term: ui_button_icon_Customize_completion_logo + TermType: 5 + Description: + Languages: + - 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/marketing/Customize/ui_button_icon_Customize_completion_logo_ko[ui_button_icon_Customize_completion_logo_ko] + Flags: 00000000 + Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 3 mTerm_AppName: