Merge remote-tracking branch 'origin/master'

client_Hale

2019-07-08 a7748c6412f34cb7b1b3830b7e0da948292371e9

Merge remote-tracking branch 'origin/master'

 System/ItemTip/TipGetWaysWidget.cs

@@ -7,22 +7,25 @@
using UnityEngine.UI;
using DG.Tweening;
using System;

using System.Collections.Generic;



namespace Snxxz.UI
{

    public class TipGetWaysWidget : MonoBehaviour
    {
        [SerializeField] WayCell[] m_GetWays;
        [SerializeField] ScrollRect m_ScrollRect;
        [SerializeField] CanvasGroup m_AlphaTween;

        string windowName;
        string windowName;

        List<WayCell> getWayBehaviours = new List<WayCell>();

        public void Display(ItemTipUtility.GetWay getWay)
        {
            for (var i = 0; i < m_GetWays.Length; i++)
        {

            CreateGetWayBehaviour(getWay.ways.Count);
            for (var i = 0; i < getWayBehaviours.Count; i++)
            {
                var behaviour = m_GetWays[i];
                var behaviour = getWayBehaviours[i];
                if (i < getWay.ways.Count)
                {
                    var way = getWay.ways[i];
@@ -37,6 +40,8 @@
                }
            }

            m_ScrollRect.verticalNormalizedPosition = 1f;
            m_ScrollRect.AddMissingComponent<RayAccepter>();
            this.gameObject.SetActive(true);
            m_AlphaTween.alpha = 0;
            m_AlphaTween.DOFade(1, 0.5f);
@@ -61,6 +66,20 @@
            m_AlphaTween.DOFade(0, 0.5f).OnComplete(() => { this.gameObject.SetActive(false); });
        }

        private void CreateGetWayBehaviour(int count)

        {

            var nowCount = getWayBehaviours.Count;

            var need = count - nowCount;

            for (var i = 0; i < need; i++)

            {

                var instance = UIUtility.CreateWidget("GetWayCell", "GetWayCell");



                instance.transform.SetParentEx(m_ScrollRect.content, Vector3.zero, Quaternion.identity, Vector3.one);

                var getWellBehaviour = instance.GetComponent<WayCell>();

                getWayBehaviours.Add(getWellBehaviour);

            }

        }

    }

}