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

client_Wu Xijin

2018-08-31 219316ab0f220e8253ef19b8671b6867a520914b

 System/FairyAu/FairyGrabBossBehaviour.cs

@@ -15,9 +15,12 @@
        [SerializeField] RectTransform m_ContainerSelect;

        [SerializeField] RectTransform m_ContainerKilling;

        [SerializeField] RectTransform m_ContainerKilled;

        [SerializeField] RectTransform m_ContainerMapName;

        [SerializeField] Image m_BossPortrait;

        [SerializeField] Text m_MapName;

        [SerializeField] Text m_BossType;

        [SerializeField] Text m_BossName;

        [SerializeField] Image m_RealmIcon;

        [SerializeField] Text m_Progress;

        [SerializeField] Button m_Select;

        public int bossId { get; private set; }

@@ -73,6 +76,26 @@
            m_BossPortrait.SetSprite(config.PortraitID);

            m_MapName.text = mapConfig.Name;

            m_BossName.text = npcConfig.charName;



            var petConfig = Config.Instance.Get<PetInfoConfig>(config.petId);

            m_BossType.text = string.Empty;

            if (petConfig != null)

            {

                m_BossType.text = Language.Get("FairyGrabPet");

                m_BossName.color = UIHelper.GetUIColor(petConfig.Quality, true);

            }

            var horseConfig = Config.Instance.Get<HorseConfig>(config.horseId);

            if (horseConfig != null)

            {

                m_BossType.text = Language.Get("FairyGrabHorse");

                m_BossName.color = UIHelper.GetUIColor(horseConfig.Quality, true);

            }



            var realmConfig = Config.Instance.Get<RealmConfig>(npcConfig.ClientRealm);

            if (realmConfig != null)

            {

                m_RealmIcon.SetSprite(realmConfig.Img);

            }

        }



        private void BossProgressUpdate(int _bossId)

@@ -106,6 +129,7 @@
            m_ContainerKilled.gameObject.SetActive(killed && opened);

            m_ContainerKilling.gameObject.SetActive(!killed && opened);

            m_BossPortrait.material = opened ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];

            m_ContainerMapName.gameObject.SetActive(!opened);

        }