diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_up_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_up_Dither.png index 75265c79..64c66874 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_up_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_up_Dither.png differ diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 6d4e1f9d..604a23cf 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -820,7 +820,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 288375600} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.67, y: 10.43, z: 0} + m_LocalPosition: {x: -0.67, y: 10.98, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1054830763} @@ -2334,7 +2334,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 719617532} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.94, y: 3.19, z: 0} + m_LocalPosition: {x: -4.94, y: 3.268, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 740614962} @@ -2413,14 +2413,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 740614961} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 5.24, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 719617533} - {fileID: 820770355} - m_Father: {fileID: 2066991625} - m_RootOrder: 1 + m_Father: {fileID: 1102296790} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &744704845 GameObject: @@ -2655,7 +2655,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 820770354} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.69, y: -2.51, z: 0} + m_LocalPosition: {x: 3.69, y: -2.46, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 740614962} @@ -2968,7 +2968,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1102296790} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &969022926 SpriteRenderer: @@ -3518,6 +3518,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1054830763} + - {fileID: 1522686120} + - {fileID: 740614962} - {fileID: 2066991625} - {fileID: 969022925} - {fileID: 1165998904} @@ -3632,11 +3634,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1165998903} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.17, y: -1.32, z: 0} + m_LocalPosition: {x: 4.4, y: -1.09, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1102296790} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1165998905 SpriteRenderer: @@ -3984,7 +3986,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280903570} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.67, y: 3.88, z: 0} + m_LocalPosition: {x: -6.55, y: 3.88, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: - {fileID: 438315599} @@ -4172,7 +4174,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478706644} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 8.03, y: 9.72, z: 0} + m_LocalPosition: {x: 8.03, y: 9.86, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1054830763} @@ -4410,7 +4412,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1506158579} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.07, z: 0} + m_LocalPosition: {x: 0.119999886, y: -0.07, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: - {fileID: 1178501604} @@ -4529,15 +4531,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1522686119} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.98, y: 1.573, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.975, y: 6.891, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1661636166} - {fileID: 2115458980} - {fileID: 944070334} - m_Father: {fileID: 2066991625} - m_RootOrder: 0 + m_Father: {fileID: 1102296790} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1556091576 PrefabInstance: @@ -5231,7 +5233,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1800387383} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.66, y: 10.17, z: 0} + m_LocalPosition: {x: 3.66, y: 10.12, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1054830763} @@ -5581,7 +5583,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1987982869} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 3.08, z: 0} + m_LocalPosition: {x: 0, y: 3.34, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1482901211} @@ -5770,7 +5772,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2048621274} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.99000007, z: 0} + m_LocalPosition: {x: 0.119999886, y: 0.99000007, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1064237506} @@ -5953,11 +5955,9 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 5.24, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1522686120} - - {fileID: 740614962} + m_Children: [] m_Father: {fileID: 1102296790} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2066991626 SpriteRenderer: @@ -6039,7 +6039,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1102296790} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -19.539001} --- !u!199 &2070127408 ParticleSystemRenderer: