diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index fc40a6d1..d3954010 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -190,6 +190,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1742302644927332555, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1742302644927332555, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1742302644927332555, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1742302644927332555, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1742302645900268983, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1742302645900268983, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1948332030859109782, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: mLocalizeTarget @@ -516,6 +546,36 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 40947599d2383e249980484ff9c2abba, type: 3} + - target: {fileID: 3338528259869159787, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3338528259869159787, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3338528260037239831, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3338528260037239831, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3338528260037239831, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3338528260037239831, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3664918248288857012, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.x @@ -536,6 +596,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4606433576246401111, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4606433576246401111, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4606433577286798635, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4606433577286798635, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4606433577286798635, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4606433577286798635, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4628054898832376065, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.x @@ -642,42 +732,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} ---- !u!114 &55686910 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7673446267768404167, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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 &55686920 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2362301707389979568, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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 &55686921 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 968457695405726169, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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 &535073476 MonoBehaviour: m_ObjectHideFlags: 0 @@ -690,7 +744,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 55686921} + mTarget: {fileID: 0} --- !u!114 &1526372568 MonoBehaviour: m_ObjectHideFlags: 0 @@ -703,7 +757,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 55686910} + mTarget: {fileID: 0} --- !u!114 &1877237825 MonoBehaviour: m_ObjectHideFlags: 0 @@ -716,7 +770,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 55686920} + mTarget: {fileID: 0} --- !u!1001 &1944170687 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab index 8a37e384..5fe84df7 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab @@ -367,7 +367,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -1603,7 +1603,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 40947599d2383e249980484ff9c2abba, type: 3} + m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index b4e1a848..0e07f7ad 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -187,6 +187,18 @@ 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 @@ -306,6 +318,18 @@ 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 @@ -421,6 +445,18 @@ 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 @@ -434,6 +470,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 0} +--- !u!114 &206438464 +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: 47983356} --- !u!1001 &227427381 PrefabInstance: m_ObjectHideFlags: 0 @@ -476,7 +525,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -486,7 +535,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -536,12 +585,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 449.19 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -674,6 +723,37 @@ 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, + type: 3} + m_PrefabInstance: {fileID: 6725113439449511083} + m_PrefabAsset: {fileID: 0} --- !u!1 &319475418 GameObject: m_ObjectHideFlags: 0 @@ -852,7 +932,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -862,7 +942,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -912,12 +992,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1367,6 +1447,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 429811576} m_CullTransparentMesh: 0 +--- !u!114 &478487828 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!114 &501846075 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1594,6 +1686,19 @@ 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 @@ -2357,6 +2462,18 @@ 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 @@ -2399,7 +2516,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2409,7 +2526,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2459,12 +2576,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1041.5701 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2580,6 +2697,31 @@ 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 @@ -3466,6 +3608,19 @@ 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 @@ -3658,6 +3813,31 @@ 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 +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: 800354489} --- !u!1 &1276255578 GameObject: m_ObjectHideFlags: 0 @@ -3929,7 +4109,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3939,7 +4119,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3989,12 +4169,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 745.38 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -4076,6 +4256,19 @@ 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 @@ -4689,6 +4882,32 @@ 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 diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 3264c5f3..3c38f95a 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -82,8 +82,8 @@ MonoBehaviour: Description: Languages: - marketing_cart_logo_Dither - - Material/marketing/marketing_cart_logo_zh_Dither[marketing_cart_logo_zh_Dither] - - Material/marketing/marketing_cart_logo_zh_Dither[marketing_cart_logo_zh_Dither] + - Material_zh/marketing/marketing_cart_logo_zh_Dither[marketing_cart_logo_zh_Dither] + - Material_zh/marketing/marketing_cart_logo_zh_Dither[marketing_cart_logo_zh_Dither] - Material_ko/marketing/marketing_cart_logo_ko_Dither[marketing_cart_logo_ko_Dither] Flags: 00000000 Languages_Touch: [] @@ -92,8 +92,8 @@ MonoBehaviour: Description: Languages: - marketing_cart_logo_EarlyType_Dither - - Material/marketing/marketing_cart_logo_EarlyType_zh_Dither[marketing_cart_logo_EarlyType_zh_Dither] - - Material/marketing/marketing_cart_logo_EarlyType_zh_Dither[marketing_cart_logo_EarlyType_zh_Dither] + - Material_zh/marketing/marketing_cart_logo_EarlyType_zh_Dither[marketing_cart_logo_EarlyType_zh_Dither] + - Material_zh/marketing/marketing_cart_logo_EarlyType_zh_Dither[marketing_cart_logo_EarlyType_zh_Dither] - Material_ko/marketing/marketing_cart_logo_EarlyType_ko_Dither[marketing_cart_logo_EarlyType_ko_Dither] Flags: 00000000 Languages_Touch: [] @@ -771,9 +771,9 @@ MonoBehaviour: 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] + - ui_button_icon_completion_logo + - Material_zh/Main/Mission/ui_button_icon_completion_logo_zh[ui_button_icon_completion_logo_zh] + - Material_zh/Main/Mission/ui_button_icon_completion_logo_zh[ui_button_icon_completion_logo_zh] - Material_ko/Main/Mission/ui_button_icon_completion_logo_ko[ui_button_icon_completion_logo_ko] Flags: 00000000 Languages_Touch: [] @@ -1132,8 +1132,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_StockMeter_StocktText - - Material/marketing/ui_marketing_StockMeter_StocktText_zh[ui_marketing_StockMeter_StocktText_zh] - - Material/marketing/ui_marketing_StockMeter_StocktText_zh[ui_marketing_StockMeter_StocktText_zh] + - Material_zh/marketing/ui_marketing_StockMeter_StocktText_zh[ui_marketing_StockMeter_StocktText_zh] + - Material_zh/marketing/ui_marketing_StockMeter_StocktText_zh[ui_marketing_StockMeter_StocktText_zh] - Material_ko/marketing/ui_marketing_StockMeter_StocktText_ko[ui_marketing_StockMeter_StocktText_ko] Flags: 00000000 Languages_Touch: [] @@ -11163,8 +11163,8 @@ MonoBehaviour: Description: Languages: - marketing_cart_logo_Second_Dither - - Material/marketing/marketing_cart_logo_Second_zh_Dither[marketing_cart_logo_Second_zh_Dither] - - Material/marketing/marketing_cart_logo_Second_zh_Dither[marketing_cart_logo_Second_zh_Dither] + - 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] - Flags: 00000000 Languages_Touch: []