diff --git a/Assets/Resources/Prefabs/MainPlayer.prefab b/Assets/Resources/Prefabs/MainPlayer.prefab index c44a6409a72bf1e7503ea4ac6420400e3ef21b5e..bc3d8605b65d30b4221c9c586b3c59091baade51 100644 --- a/Assets/Resources/Prefabs/MainPlayer.prefab +++ b/Assets/Resources/Prefabs/MainPlayer.prefab @@ -408,11 +408,11 @@ MonoBehaviour: Sprite: {fileID: 21300000, guid: ea5873cfd9158664f89459f0c9e1d853, type: 3} ignoreLayerMask: serializedVersion: 2 - m_Bits: 96768 + m_Bits: 64000 Cursor: {fileID: 7593098362214606413} LayerPendulumHits: serializedVersion: 2 - m_Bits: 32769 + m_Bits: 1 lineRenderer: {fileID: 2563576905681239437} linePreviewMaterial: {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2} poleHeight: 1.5 @@ -1115,7 +1115,7 @@ MonoBehaviour: Sprite: {fileID: 21300000, guid: 0b5fd1ea5a3b1a74588f605621176b6a, type: 3} ignoreLayerMask: serializedVersion: 2 - m_Bits: 86528 + m_Bits: 53760 Cursor: {fileID: 7593098362214606413} lineRenderer: {fileID: 2563576905681239437} linePreviewMaterial: {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2} @@ -2708,7 +2708,7 @@ MonoBehaviour: Sprite: {fileID: 21300000, guid: 644edf8b3fa05da418500a0e9dd10820, type: 3} ignoreLayerMask: serializedVersion: 2 - m_Bits: 96768 + m_Bits: 64000 Cursor: {fileID: 7593098362214606413} lineRenderer: {fileID: 2563576905681239437} anglePreviewMaterial: {fileID: 2100000, guid: 8a28cccde2536794c97ec91954e34e90, @@ -4019,7 +4019,7 @@ MonoBehaviour: Sprite: {fileID: 21300026, guid: fd419bef7a36af8459a810bc72573105, type: 3} ignoreLayerMask: serializedVersion: 2 - m_Bits: 96768 + m_Bits: 64000 Cursor: {fileID: 7593098362214606413} LayerPendulumHits: serializedVersion: 2 @@ -8117,7 +8117,7 @@ MonoBehaviour: Sprite: {fileID: 21300000, guid: 23ef0c9f8111e14439483be733da29eb, type: 3} ignoreLayerMask: serializedVersion: 2 - m_Bits: 96768 + m_Bits: 64000 Cursor: {fileID: 7593098362214606413} maxHeight: 2.5 lineRenderer: {fileID: 2563576905681239437} @@ -8966,7 +8966,7 @@ MonoBehaviour: Sprite: {fileID: 21300000, guid: fa8323d8b52054c46b24fc9a0040caa3, type: 3} ignoreLayerMask: serializedVersion: 2 - m_Bits: 96768 + m_Bits: 64000 Cursor: {fileID: 7593098362214606413} lineRenderer: {fileID: 2563576905681239437} linePreviewMaterial: {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2} diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity index a138fa8e01a4314e74279fdd91a704600b6bb946..47e938462a34ddf58920290edffc6b8fe04d8302 100644 --- a/Assets/Scenes/Worlds/RiverWorld.unity +++ b/Assets/Scenes/Worlds/RiverWorld.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4410664, g: 0.4898227, b: 0.5699191, a: 1} + m_IndirectSpecularColor: {r: 0.4410865, g: 0.48984045, b: 0.5699203, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -57503,17 +57503,17 @@ PrefabInstance: - target: {fileID: 1674269358079891809, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: ignoreLayerMask.m_Bits - value: 96770 + value: 64002 objectReference: {fileID: 0} - target: {fileID: 1818403897284392891, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: ignoreLayerMask.m_Bits - value: 96770 + value: 64002 objectReference: {fileID: 0} - target: {fileID: 1823625680044443765, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: ignoreLayerMask.m_Bits - value: 96770 + value: 64002 objectReference: {fileID: 0} - target: {fileID: 3020720017683626808, guid: b07552db700124a4680401e6fb94c186, type: 3} @@ -57620,6 +57620,11 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3020720018505806861, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3020720018505806863, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_Value @@ -57864,23 +57869,28 @@ PrefabInstance: - target: {fileID: 6257878582612889409, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: ignoreLayerMask.m_Bits - value: 86530 + value: 53762 objectReference: {fileID: 0} - target: {fileID: 6273128013715165205, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: ignoreLayerMask.m_Bits - value: 96770 + value: 64002 objectReference: {fileID: 0} - target: {fileID: 6498947068189087390, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: ignoreLayerMask.m_Bits - value: 96770 + value: 64002 objectReference: {fileID: 0} - target: {fileID: 8180161551596881868, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: ignoreLayerMask.m_Bits value: 531 objectReference: {fileID: 0} + - target: {fileID: 8190019496087713876, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8969233071563121268, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: ignoreLayerMask.m_Bits