diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_Dither.png index 19181121..288ef32a 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_a_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_a_Dither.png index 616cba65..132c4785 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_a_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_a_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_b_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_b_Dither.png index f6cc6ebc..63266153 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_b_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_b_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_c_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_c_Dither.png deleted file mode 100644 index 4f59b6b5..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_c_Dither.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_e_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_e_Dither.png new file mode 100644 index 00000000..75fd2d4e Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_e_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_c_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_e_Dither.png.meta similarity index 98% rename from popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_c_Dither.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_e_Dither.png.meta index cf4a220a..92f4270b 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_c_Dither.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_cardboard_e_Dither.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b52f4c469314114c9323a3a76103008 +guid: 95aacb3540a714e15bc506ffbd1c685e TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_chear.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_chear.png index 74813259..5a3a2b55 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_chear.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_chear.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_desk_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_desk_Dither.png index d275f7b4..b731ddc9 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_desk_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_desk_Dither.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 8f908b1e..849aec59 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -2829,12 +2829,12 @@ PrefabInstance: - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, type: 3} propertyPath: m_LocalPosition.x - value: -8.41 + value: -7.45 objectReference: {fileID: 0} - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, type: 3} propertyPath: m_LocalPosition.y - value: -9.77 + value: -10.71 objectReference: {fileID: 0} - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, type: 3} @@ -2884,7 +2884,7 @@ PrefabInstance: - target: {fileID: 7416233741422776622, guid: 4646d5e1d9b5c5047badae454ae7703a, type: 3} propertyPath: m_SortingOrder - value: 3 + value: 7 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4646d5e1d9b5c5047badae454ae7703a, type: 3} @@ -4442,12 +4442,12 @@ PrefabInstance: - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, type: 3} propertyPath: m_LocalPosition.x - value: 7.67 + value: -2.64 objectReference: {fileID: 0} - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, type: 3} propertyPath: m_LocalPosition.y - value: -7.4799995 + value: -10.5 objectReference: {fileID: 0} - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, type: 3} @@ -4494,6 +4494,11 @@ PrefabInstance: propertyPath: m_Name value: cardboard_b objectReference: {fileID: 0} + - target: {fileID: 8978363875744781964, guid: 59565d4a26dde7942967ece7fcb898ca, + type: 3} + propertyPath: m_SortingOrder + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 59565d4a26dde7942967ece7fcb898ca, type: 3} --- !u!4 &1563198520393793683 stripped @@ -4517,12 +4522,12 @@ PrefabInstance: - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, type: 3} propertyPath: m_LocalPosition.x - value: -5.87 + value: -5.21 objectReference: {fileID: 0} - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, type: 3} propertyPath: m_LocalPosition.y - value: -9.1 + value: -9.86 objectReference: {fileID: 0} - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, type: 3} @@ -4564,6 +4569,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4710813695754945571, guid: 87436f653f19aa340b31a3bbc779e112, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 042fbbcd78f83b74aa16da70a6859157, + type: 3} - target: {fileID: 8543293137893879736, guid: 87436f653f19aa340b31a3bbc779e112, type: 3} propertyPath: m_Name @@ -4980,12 +4991,12 @@ PrefabInstance: - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, type: 3} propertyPath: m_LocalPosition.x - value: 7.67 + value: 7.11 objectReference: {fileID: 0} - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, type: 3} propertyPath: m_LocalPosition.y - value: -8.549999 + value: -9.44 objectReference: {fileID: 0} - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, type: 3} @@ -5032,6 +5043,12 @@ PrefabInstance: propertyPath: m_Name value: cardboard_a objectReference: {fileID: 0} + - target: {fileID: 7416233741422776622, guid: 4646d5e1d9b5c5047badae454ae7703a, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: db3153399c7f3b94f861680a27125a22, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4646d5e1d9b5c5047badae454ae7703a, type: 3} --- !u!4 &3915769149207111995 stripped @@ -5047,6 +5064,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2001111210} m_Modifications: + - target: {fileID: 4395700041655002428, guid: 9f5470ead7b654f418ae4740ffe0be03, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 95aacb3540a714e15bc506ffbd1c685e, + type: 3} - target: {fileID: 7681701658211512410, guid: 9f5470ead7b654f418ae4740ffe0be03, type: 3} propertyPath: m_Name @@ -5060,12 +5083,12 @@ PrefabInstance: - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, type: 3} propertyPath: m_LocalPosition.x - value: 5.22 + value: 4.75 objectReference: {fileID: 0} - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, type: 3} propertyPath: m_LocalPosition.y - value: -10.03 + value: -10.35 objectReference: {fileID: 0} - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, type: 3}