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

client_Zxw

2018-11-23 b8f73bfa88332ecd65c201a2afad15a25a08cf0a

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

 System/Treasure/DemonTreasureWin.cs

@@ -22,6 +22,7 @@
        [SerializeField] Text m_SkillState;

        [SerializeField] Text m_SkillName;

        [SerializeField] Text m_SkillDescription;

        [SerializeField] ScrollRect m_ScrollRect;

        [SerializeField] RectTransform m_DungeonsContent;

        [SerializeField] Transform m_ContainerDungeons;

        [SerializeField] DemonDungeonBehaviour[] m_DungeonBehaviours;

@@ -456,6 +457,8 @@
                    treasureDungeon.maxLevel : (treasureDungeon.currentLevel + 1);

                var selectPosition = scriptable.GetPosition(selectLevel - 1);

                var lastPosition = scriptable.GetPosition(treasureDungeon.maxLevel - 1);

                m_DungeonsContent.sizeDelta = m_DungeonsContent.sizeDelta.SetY(lastPosition.y + height / 2 * expand);

                m_ScrollRect.vertical = (lastPosition.y + height / 2 * expand) > viewAreaHeight;

                if (selectPosition.y + (height / 2) * expand <= viewAreaHeight)

                {

                    m_DungeonsContent.anchoredPosition = Vector3.zero;