diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare.png index 2eb7f08b..7d826c20 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index efe9ac47..364e756a 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -17676,6 +17676,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8869708493587088493, guid: 4d49c71079a444963857b600f7b6384c, + type: 3} + propertyPath: m_Text + value: "\u58F2\u5024 \uFF0B10% \u30A2\u30C3\u30D7" + objectReference: {fileID: 0} - target: {fileID: 8869708493587088498, guid: 4d49c71079a444963857b600f7b6384c, type: 3} propertyPath: m_AnchorMax.y diff --git a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity index fa8b6915..1c3449ab 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity @@ -223,19 +223,9 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 934484248314616495, guid: 6592613d31e034734bea16833d6345c1, + - target: {fileID: 1044516941948515797, guid: 6592613d31e034734bea16833d6345c1, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 934484248314616495, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 934484248314616495, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_LocalScale.z + propertyPath: m_Type value: 1 objectReference: {fileID: 0} - target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1, @@ -286,143 +276,193 @@ PrefabInstance: - target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1, type: 3} propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3856012874794846574, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - propertyPath: m_AnchoredPosition.y value: 50 objectReference: {fileID: 0} + - target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -95 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -95 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -95 + objectReference: {fileID: 0} + - target: {fileID: 3850846013988262856, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850846014693497809, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850846015483967882, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3856012874490264331, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -48 + objectReference: {fileID: 0} + - target: {fileID: 3856012874861365792, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 3856012874977579074, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3856012874977579074, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 3856012874977579074, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_FontData.m_FontStyle + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3856012874977579075, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 3856012875109116651, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 44.89997 + objectReference: {fileID: 0} + - target: {fileID: 3856012875199795011, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 467 + objectReference: {fileID: 0} - target: {fileID: 3856012875358022744, guid: 6592613d31e034734bea16833d6345c1, type: 3} propertyPath: m_Name @@ -543,6 +583,51 @@ PrefabInstance: propertyPath: m_RenderMode value: 1 objectReference: {fileID: 0} + - target: {fileID: 3856012875378235477, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 3856012875378235477, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 334 + objectReference: {fileID: 0} + - target: {fileID: 3856012875614048344, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 850 + objectReference: {fileID: 0} + - target: {fileID: 3856012875614048344, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 44 + objectReference: {fileID: 0} + - target: {fileID: 3856012876379087770, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 194 + objectReference: {fileID: 0} + - target: {fileID: 4111097017210071838, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.x + value: 650 + objectReference: {fileID: 0} + - target: {fileID: 4111097017210071838, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 4111097017210071838, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -13.000002 + objectReference: {fileID: 0} + - target: {fileID: 5921543939047703470, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -265 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6592613d31e034734bea16833d6345c1, type: 3} --- !u!224 &3856012874773314170 stripped diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 962b241c..600a7712 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 49.586002} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 244, y: -370} + m_AnchoredPosition: {x: 244, y: -318} m_SizeDelta: {x: 76, y: 182} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5183137526989206975 @@ -257,8 +257,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -15.9999695} - m_SizeDelta: {x: 640, y: 210} + m_AnchoredPosition: {x: 0, y: -12} + m_SizeDelta: {x: 640, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1674871521371329343 CanvasRenderer: @@ -431,8 +431,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -17.100021} - m_SizeDelta: {x: 610, y: 170} + m_AnchoredPosition: {x: 0, y: -13.000005} + m_SizeDelta: {x: 610, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3856012874490264330 MonoBehaviour: @@ -454,7 +454,7 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 198, y: 72} + m_CellSize: {x: 198, y: 50} m_Spacing: {x: 8, y: 20} m_Constraint: 0 m_ConstraintCount: 2 @@ -515,7 +515,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 50} m_SizeDelta: {x: 750, y: 950} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5360726889513396134 @@ -782,7 +782,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -255, y: 99.89998} + m_AnchoredPosition: {x: -255, y: 79.89997} m_SizeDelta: {x: 92, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875109116653 @@ -1147,8 +1147,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 274} - m_SizeDelta: {x: 650, y: 240} + m_AnchoredPosition: {x: 0, y: 295} + m_SizeDelta: {x: 650, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3856012875447652418 GameObject: @@ -1333,8 +1333,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 750, y: 950} + m_AnchoredPosition: {x: 0, y: 22} + m_SizeDelta: {x: 750, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875614048346 CanvasRenderer: @@ -1979,7 +1979,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 85} + m_AnchoredPosition: {x: 0, y: 137} m_SizeDelta: {x: 196, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012876379087775 @@ -2580,7 +2580,7 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2590,17 +2590,17 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 198 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 72 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2640,12 +2640,12 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 305 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -128 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2924,7 +2924,7 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2934,17 +2934,17 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 198 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 72 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2984,12 +2984,12 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 99 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -128 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3283,7 +3283,7 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3293,17 +3293,17 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 198 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 72 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3343,12 +3343,12 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 511 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -128 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab index 13d46804..cf8ca6b7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab @@ -30,7 +30,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1885844597663085898} - {fileID: 6312542440500240187} - {fileID: 6455044629331111166} m_Father: {fileID: 0} @@ -39,7 +38,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 198, y: 72} + m_SizeDelta: {x: 198, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7347831002230456565 MonoBehaviour: @@ -119,7 +118,7 @@ RectTransform: m_GameObject: {fileID: 118881578073385056} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8763870702389052045} - {fileID: 3958174196424925839} @@ -129,11 +128,11 @@ RectTransform: - {fileID: 3528240436582954316} - {fileID: 4140139835429470432} m_Father: {fileID: 551217487534969408} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 1.6, y: -8.2} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 25, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3520814803198781947 @@ -425,12 +424,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 551217487534969408} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 114.10005, y: -48.299988} - m_SizeDelta: {x: 144, y: 46} + m_AnchoredPosition: {x: 116.6, y: -26.2} + m_SizeDelta: {x: 145, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5542324150579234386 CanvasRenderer: @@ -461,12 +460,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 25 - m_MaxSize: 30 - m_Alignment: 5 + m_MinSize: 28 + m_MaxSize: 32 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -5402,80 +5401,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &7802156769292725947 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1885844597663085898} - - component: {fileID: 6589301141231957082} - - component: {fileID: 3834438305981672667} - m_Layer: 0 - m_Name: icon_coin - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1885844597663085898 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7802156769292725947} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.380001, y: 0.380001, z: 0.380001} - m_Children: [] - m_Father: {fileID: 551217487534969408} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25.8, y: -47.3} - m_SizeDelta: {x: 86, y: 92} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6589301141231957082 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7802156769292725947} - m_CullTransparentMesh: 0 ---- !u!114 &3834438305981672667 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7802156769292725947} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 49b034d081d0e324cb96972d614001d9, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &8966107942931458497 GameObject: m_ObjectHideFlags: 0