3335 Vip特权修改

client_linchunjie

2019-06-10 b11535f045174199ee52f36bcf5b4a8e885466c0

3335 Vip特权修改

 System/Vip/VipPrivilegeWidget.cs

@@ -59,7 +59,7 @@
                    }

                    break;

                case 6:

                    var isEmptyLabel = string.IsNullOrEmpty(label);

                    var isEmptyLabel = label.Equals("Null");

                    m_NullSymbol.gameObject.SetActive(isEmptyLabel);

                    m_Description.gameObject.SetActive(!isEmptyLabel);

                    if (!isEmptyLabel)


 UI/Common/ScrollRectGroup.cs

@@ -7,6 +7,7 @@
public class ScrollRectGroup : MonoBehaviour, IInitializePotentialDragHandler, IBeginDragHandler, IEndDragHandler, IDragHandler

{

    [SerializeField] ScrollRect[] m_ScrollRects;

    [SerializeField] Direction m_OnlyDirection;

    [SerializeField] float m_Offset = 100f;



    Dictionary<Direction, ScrollRect> scrollRects = new Dictionary<Direction, ScrollRect>();

@@ -86,20 +87,27 @@
        var position = eventData.position;

        if (direction == Direction.Both)

        {

            var horizontal = Mathf.Abs(position.x - m_StartPosition.x) > m_Offset;

            var vertical = !horizontal && Mathf.Abs(position.y - m_StartPosition.y) > m_Offset;

            if (horizontal || vertical)

            if (m_OnlyDirection == Direction.Both)

            {

                var _direction = horizontal ? Direction.Horizontal : Direction.Vertical;

                if (_direction != direction)

                var horizontal = Mathf.Abs(position.x - m_StartPosition.x) > m_Offset;

                var vertical = !horizontal && Mathf.Abs(position.y - m_StartPosition.y) > m_Offset;

                if (horizontal || vertical)

                {

                    direction = _direction;

                    foreach (var scrollRect in m_ScrollRects)

                    var _direction = horizontal ? Direction.Horizontal : Direction.Vertical;

                    if (_direction != direction)

                    {

                        scrollRect.OnBeginDrag(eventData);

                        direction = _direction;

                        foreach (var scrollRect in m_ScrollRects)

                        {

                            scrollRect.OnBeginDrag(eventData);

                        }

                    }

                }

            }

            else

            {

                direction = m_OnlyDirection;

            }

        }



        if (direction != Direction.Both)