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

QD_LCJ

2018-08-10 c9cd6e462d9439e9a7734a02976380f74e9af596

 UI/Common/BossLifeBar.cs

@@ -24,6 +24,7 @@
        [SerializeField] Slider m_SliderForeground;

        [SerializeField] Text m_Surplus;
        [SerializeField] Image m_Realm;
        [SerializeField] Text m_BossName;
        [SerializeField] Text m_BossLevel;

@@ -73,6 +74,16 @@
            m_BossName.text = npcConfig.charName;
            m_BossLevel.text = _level.ToString();
            m_BossIcon.SetSprite(npcConfig.HeadPortrait);
            if (npcConfig.Realm > 0)
            {
                m_Realm.gameObject.SetActive(true);
                var realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(npcConfig.Realm);
                m_Realm.SetSprite(realmConfig.Img);
            }
            else
            {
                m_Realm.gameObject.SetActive(false);
            }

            surplusSegments = -1;
            totalSegments = npcConfig.LifeBarCount;