Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-09 cf9a6706f146df42cd16b748fbbf13e8b19aaa2c

Merge branch 'master' into 3687天赋功能

 System/Skill/TalentWin.cs

@@ -257,7 +257,7 @@
                m_ContainerSelectSkill.gameObject.SetActive(true);

                var config = talent.GetSkillConfig(talent.level);

                m_SelectSkillIcon.SetSprite(config.IconName);

                m_SelectSkillLevel.text = StringUtility.Contact(talent.level, "/", talent.maxLevel);

                m_SelectSkillLevel.text = StringUtility.Contact(Language.Get("TalentLevel"), talent.level, "/", talent.maxLevel);

                m_SelectSkillName.text = config.SkillName;

            }

        }