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

yyl

6 天以前 1d452e735a0dac22dab7d0bf7c3bc7458de30448

 Main/System/HeroUI/HeroUIManager.cs

@@ -507,6 +507,8 @@
        }
        else
        {
            if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.HeroAwake))
            {
            //判断觉醒材料是否足够
            var maxAwakeLV = HeroAwakeConfig.GetMaxAwakeLV(hero.heroId);
            if (hero.awakeLevel < maxAwakeLV)
@@ -518,6 +520,7 @@
                }
            }
        }
        }

        if (hero.heroStar < hero.GetCurMaxStar() && heroCnt > 1)
        {