Merge branch 'master' into Equip

client_Wu Xijin

2019-03-04 20863e863fcc3b4824fc12ddd7f3c2e709f1158d

 System/Skill/TreasurePotentialLevelUpWin.cs

@@ -26,6 +26,7 @@
        [SerializeField] Text m_PreSkillCondition;

        [SerializeField] ItemBehaviour m_Item;

        [SerializeField] Transform m_ContainerMax;

        [SerializeField] Button m_Learn;

        [SerializeField] Button m_LevelUp;

        [SerializeField] Button m_GetWay;

        [SerializeField] Button m_Close;

@@ -51,6 +52,7 @@
        protected override void AddListeners()

        {

            m_LevelUp.AddListener(LevelUp);

            m_Learn.AddListener(LevelUp);

            m_Close.AddListener(CloseClick);

            m_GetWay.AddListener(GetWay);

        }

@@ -146,9 +148,16 @@
                }

            }



            var potentialLevel = 0;

            if (potential != null)

            {

                potentialLevel = potential.level;

            }



            var error = 0;

            bool satisfyLevelUp = model.TryLevelUpPotential(selectPotentialId, out error);

            m_LevelUp.gameObject.SetActive(satisfyLevelUp);

            m_LevelUp.gameObject.SetActive(satisfyLevelUp && potentialLevel > 0);

            m_Learn.gameObject.SetActive(satisfyLevelUp && potentialLevel == 0);

        }



        private void GetWay()