From d4075eccc403ff4f3845e8a86b084630c06cec91 Mon Sep 17 00:00:00 2001 From: OceanSlim Date: Wed, 25 Jan 2023 17:06:01 -0500 Subject: [PATCH] resolving merge --- Assets/Scenes/Item Prefab Collection.unity | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/Scenes/Item Prefab Collection.unity b/Assets/Scenes/Item Prefab Collection.unity index 88b50ffd..b0c087b4 100644 --- a/Assets/Scenes/Item Prefab Collection.unity +++ b/Assets/Scenes/Item Prefab Collection.unity @@ -37499,7 +37499,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1206005369} m_HandleRect: {fileID: 1206005368} m_Direction: 2 - m_Value: 0.99999964 + m_Value: 1 m_Size: 0.5264038 m_NumberOfSteps: 0 m_OnValueChanged: @@ -54090,7 +54090,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1406011022} m_HandleRect: {fileID: 1406011021} m_Direction: 2 - m_Value: 0.9999999 + m_Value: 1 m_Size: 0.2979719 m_NumberOfSteps: 0 m_OnValueChanged: @@ -73107,8 +73107,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1258994301} m_HandleRect: {fileID: 1258994300} m_Direction: 0 - m_Value: 0 - m_Size: 0.9999999 + m_Value: 1 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -90542,7 +90542,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1070636680} m_Direction: 0 m_Value: 0 - m_Size: 1 + m_Size: 0.99999994 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -107831,8 +107831,8 @@ RectTransform: m_Father: {fileID: 1767032639} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584.8999, y: 2500} m_Pivot: {x: 0, y: 1}