diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_Dither.png index bd863e8b..fb350423 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter.png index fc55dea9..e03c4edd 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b.png index ee2976f7..0dd8407b 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Title/Title.unity b/popcorn/Assets/MyGame/Scenes/Title/Title.unity index b312b80f..3c9ff59d 100644 --- a/popcorn/Assets/MyGame/Scenes/Title/Title.unity +++ b/popcorn/Assets/MyGame/Scenes/Title/Title.unity @@ -845,7 +845,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 231039072} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.32, z: 0} + m_LocalPosition: {x: -0.11, y: 1.73, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 681979182} @@ -1044,7 +1044,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 344846040} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.86, y: 2.48, z: 0} + m_LocalPosition: {x: -2.76, y: 3.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1442018104} @@ -3206,7 +3206,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1129719412} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.91, y: -0.88, z: 0} + m_LocalPosition: {x: 4.7, y: -0.67, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1361506310} @@ -3539,8 +3539,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1258179546} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.43, y: 2.47, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_LocalPosition: {x: -7.22, y: 3.2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1526919379} m_Father: {fileID: 1868499504} @@ -10237,7 +10237,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2063870804} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.3400001, z: -1} + m_LocalPosition: {x: -0.11, y: 0.7500001, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 294638333} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 62cd5e5e..69a2b851 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -146,7 +146,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 53013340} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.45, z: 0} + m_LocalPosition: {x: -0.03, y: 0.45, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 438315599} @@ -1403,7 +1403,7 @@ Transform: m_GameObject: {fileID: 480571862} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.77, y: 3.01, z: 0} - m_LocalScale: {x: 0.90586, y: 0.90586, z: 0.90586} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 716489325} - {fileID: 1819206276} @@ -4087,7 +4087,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1165998903} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.51, y: -0.73, z: 0} + m_LocalPosition: {x: 4.69, y: -0.73, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1102296790} @@ -4439,7 +4439,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280903570} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -7.07, y: 4.48, z: 0} + m_LocalPosition: {x: -7.21, y: 4.38, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 438315599} @@ -4708,7 +4708,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1482901210} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.12, y: 1.56, z: 0} + m_LocalPosition: {x: 0.26, y: 1.56, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1987982870} @@ -5767,7 +5767,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1806801954} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.177, y: -1.029, z: 0} + m_LocalPosition: {x: -0.14, y: -0.99, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 438315599} @@ -6198,7 +6198,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.05, z: 0} + m_LocalPosition: {x: -0.39, y: 3.05, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1482901211} @@ -10209,7 +10209,7 @@ ParticleSystem: ctime5: 0 ctime6: 0 ctime7: 0 - atime0: 0 + atime0: 28913 atime1: 65535 atime2: 0 atime3: 0