From 40faa615b0b59e0b92dd6b4d764632291904a2ba Mon Sep 17 00:00:00 2001 From: Ivy Date: Tue, 4 May 2021 20:19:21 -0500 Subject: [PATCH] Changes to backgrounds --- .../Assets/Scenes/DogLevel/DogBoss.unity | 36 +++++++++---------- .../Assets/Scenes/DogLevel/NewDogSpawn.unity | 2 +- .../Scenes/DogLevel/ShrinkPowerup.unity | 2 +- .../UserSettings/EditorUserSettings.asset | 14 ++++---- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity b/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity index 2226693..da7428c 100644 --- a/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity +++ b/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity @@ -214,23 +214,7 @@ CompositeCollider2D: m_ColliderPaths: - m_Collider: {fileID: 73552635} m_ColliderPaths: - - - X: -49375057 - Y: -19999915 - - X: -50000085 - Y: -20624943 - - X: -50000100 - Y: -20624980 - - X: -50000100 - Y: -28125020 - - X: -50000085 - Y: -28125057 - - X: -48125057 - Y: -30000085 - - X: -48125020 - Y: -30000100 - - X: 107500020 - Y: -30000100 - - X: 107500057 + - - X: 107500057 Y: -30000085 - X: 110000085 Y: -27500057 @@ -246,6 +230,22 @@ CompositeCollider2D: Y: -19999900 - X: -49375020 Y: -19999900 + - X: -49375057 + Y: -19999915 + - X: -50000085 + Y: -20624943 + - X: -50000100 + Y: -20624980 + - X: -50000100 + Y: -28125020 + - X: -50000085 + Y: -28125057 + - X: -48125057 + Y: -30000085 + - X: -48125020 + Y: -30000100 + - X: 107500020 + Y: -30000100 m_CompositePaths: m_Paths: - - {x: 10.749991, y: -3.00001} @@ -821,7 +821,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.43137258, g: 0.65882355, b: 0.39607847, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/MuseumGame/Assets/Scenes/DogLevel/NewDogSpawn.unity b/MuseumGame/Assets/Scenes/DogLevel/NewDogSpawn.unity index 367b615..9e62f7f 100644 --- a/MuseumGame/Assets/Scenes/DogLevel/NewDogSpawn.unity +++ b/MuseumGame/Assets/Scenes/DogLevel/NewDogSpawn.unity @@ -10603,7 +10603,7 @@ TilemapRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 4079c6caa2ad3cb458ea5f71308168f2, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/MuseumGame/Assets/Scenes/DogLevel/ShrinkPowerup.unity b/MuseumGame/Assets/Scenes/DogLevel/ShrinkPowerup.unity index afc2654..5c93273 100644 --- a/MuseumGame/Assets/Scenes/DogLevel/ShrinkPowerup.unity +++ b/MuseumGame/Assets/Scenes/DogLevel/ShrinkPowerup.unity @@ -2428,7 +2428,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.43137258, g: 0.65882355, b: 0.39607847, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 9e6bd1e..cb2034c 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,31 +6,31 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b1f113b1d3c29246903253b143de9d03b2fe7f523f9a92f31352d1b flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246903253b143de9d03b2fe7f523f9a92f31352d1b + value: 22424703114646680e0b0227036c7b1f113b1d3c29246904221a1521ebee3f08edf033fbf22a7129370bfb25 flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b1f113b1d3c2924691e283e393ce5d32439f5e978fce9332b25 + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246904221a1521ebee3f08edf033fbf22a7129370bfb25 + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e2926ecee3134acf238e0f323 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e2926ecee3134acf238e0f323 + value: 22424703114646680e0b0227036c7b1f113b1d3c2924691e283e393ce5d32439f5e978fce9332b25 flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c72111f19352f223d68252320092a