Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-10-18 4e196740debaffb8a79a014046e9dd530a450dd9

 System/Skill/TalentTreeScriptable.cs

@@ -19,6 +19,16 @@
            get { return m_ContentSizeDelta; }

        }



        public int arrowCount

        {

            get { return arrowElements == null ? 0 : arrowElements.Count; }

        }



        public int skillCount

        {

            get { return skillElements == null ? 0 : skillElements.Count; }

        }



        public TalentElement GetTalentElement(int index)

        {

            if (skillElements != null && index < skillElements.Count)

@@ -78,7 +88,7 @@
            }

        }



        public void ApplyArrowElement(int index, Vector3 _position, Vector2 _sizeDelta)

        public void ApplyArrowElement(int index, Vector3 _position, Vector2 _sizeDelta, Vector3 _rotation, string _iconKey)

        {

            if (arrowElements == null)

            {

@@ -88,6 +98,8 @@
            {

                position = _position,

                sizeDelta = _sizeDelta,

                rotation = _rotation,

                iconKey = _iconKey,

            };

            if (index >= arrowElements.Count)

            {

@@ -162,7 +174,9 @@
        [Serializable]

        public struct ArrowElement

        {

            public string iconKey;

            public Vector3 position;

            public Vector3 rotation;

            public Vector2 sizeDelta;

        }

    }