Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

2 天以前 258234852dd4c5e7c70df9b9fe2a3f91e53d965a

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

 Main/System/HeroUI/HeroBestWin.cs

@@ -480,7 +480,16 @@
            else if (type == 2)
            {
                var skill = SkillConfig.Get(config.SkillID);

                if (skill != null)
                {
                awakeStr = Language.Get("L1039", skill.SkillName) + skill.Description;
                    awakeStr = Language.Get("L1039", skill.SkillName) + skill.Description;
                }
                else
                {
                    Debug.LogError($"heroId:{HeroUIManager.Instance.selectForPreviewHeroID} 觉醒技能ID:{config.SkillID} 配置错误技能不存在");
                }
            }
            else
            {

 Main/System/HeroUI/HeroTrainWin.cs

@@ -711,10 +711,17 @@
            else if (type == 2)
            {
                var skill = SkillConfig.Get(config.SkillID);
                if (skill != null)
                {
                awakeStr = Language.Get("L1039", skill.SkillName) + skill.Description;
            }
            else
            {
                    Debug.LogError($"heroId:{hero.heroId} 觉醒技能ID:{config.SkillID} 配置错误技能不存在");
                }
            }
            else
            {
                for (int k = 0; k < config.AttrIDList.Length; k++)
                {
                    awakeStr += (string.IsNullOrEmpty(config.SkillIName) ? string.Empty : Language.Get("L1039", config.SkillIName)) +