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

client_Zxw

2018-09-05 6e7b8fd0d052719ec4306b49d1ab0462aaf6d11c

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

 System/Treasure/TreasurePotentialBriefInfo.cs

@@ -63,7 +63,7 @@
            }

            m_Level.text = _unlock ? StringUtility.Contact(_potential.level, "/", maxLevel) : string.Empty;

            m_Level.transform.localScale = Vector3.one;

            m_PotentialName.text = _unlock ? config.SkillName : string.Empty;

            m_PotentialName.text = config.SkillName;// _unlock ? config.SkillName : string.Empty;



            model.potentialLevelChangeEvent -= OnPotentialLevelUp;

            model.potentialLevelChangeEvent += OnPotentialLevelUp;

@@ -97,7 +97,7 @@
            bool _unlock = potential != null && model.IsPotentialUnlock(model.selectedTreasure, potential.id);

            m_Level.text = _unlock ? StringUtility.Contact(potential.level, "/", maxLevel) : string.Empty;

            m_Level.transform.localScale = Vector3.one;

            m_PotentialName.text = _unlock ? config.SkillName : string.Empty;

            m_PotentialName.text = config.SkillName;// _unlock ? config.SkillName : string.Empty;

        }



        public void OnPotentialSelected(int _potentialId)