diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_stop.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_stop.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_stop.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_stop.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_stop.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_stop.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_stop.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_stop.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_a.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_a.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_a.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_a.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_a.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_a.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_a.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_b.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_b.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_b.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_b.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_b.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_b.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_b.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_stop.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_stop.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_stop.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_stop.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_stop.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_stop.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_stop.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_stop.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_a.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_a.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_a.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_a.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_a.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_a.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_a.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_b.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_b.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_b.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_b.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_b.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_b.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_b.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_stop.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_stop.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_stop.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_stop.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_stop.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_stop.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_stop.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_stop.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_a.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_a.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_a.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_a.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_a.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_a.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_a.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_b.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_b.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_b.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_b.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_b.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_b.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_b.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_Before.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_Before.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_Before.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_Before.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_Before.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_Before.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_Before.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_Before.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_back.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_back.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_back.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_back.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_back.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_back.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_back.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_back.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_middle.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_middle.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_middle.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_middle.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_middle.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_middle.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_middle.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_middle.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_Before.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_Before.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_Before.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_Before.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_Before.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_Before.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_Before.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_Before.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_back.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_back.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_back.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_back.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_back.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_back.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_back.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_back.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_middle.png b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_middle.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_middle.png rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_middle.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_middle.png.meta b/popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_middle.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_middle.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_middle.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_car_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_car_Dither.png index 997f8783..b0e9fff9 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_car_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_car_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_fill.png b/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_fill.png index d11c22d9..291d4d9b 100644 Binary files a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_fill.png and b/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_fill.png differ diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index ec072353..a6962537 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -1089,7 +1089,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 438315598} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.56, y: -0.16, z: 0} + m_LocalPosition: {x: 3.16, y: -0.16, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 53013341} @@ -1789,6 +1789,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 260.70312 objectReference: {fileID: 0} + - target: {fileID: 7545339558603919741, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -413 + objectReference: {fileID: 0} + - target: {fileID: 7545339558603919741, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 670 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} --- !u!1 &757275525 @@ -2816,7 +2826,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280903570} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.59, y: 3.51, z: 0} + m_LocalPosition: {x: -6.67, y: 3.51, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: - {fileID: 240851457}