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

client_Hale

2018-10-09 2e7aa5faabcbe00757c74379f67b3231b1b3370f

 System/FindPrecious/ElderGodBreifInfoBehaviour.cs

@@ -27,7 +27,8 @@
        protected override InteractorableState interactorableState {

            get {

                var selected = selectedBossId == bossId;

                var dieOrLocked = !model.IsBossUnLocked(bossId) || !findPreciousModel.IsBossAlive(bossId);

                var config = Config.Instance.Get<ElderGodAreaConfig>(bossId);

                var dieOrLocked = config.MonsterType == 2 && (!model.IsBossUnLocked(bossId) || !findPreciousModel.IsBossAlive(bossId));



                if (!dieOrLocked)

                {

@@ -74,6 +75,44 @@
            UpdateBossNameLevelFont(interactorableState);

        }



        protected override void DrawBossBaseInfo(string _icon, string _name, int _level, int _realm)

        {

            var config = Config.Instance.Get<ElderGodAreaConfig>(bossId);

            m_Portrait.SetSprite(_icon);

            m_Portrait.SetNativeSize();



            switch (config.MonsterType)

            {

                case 1:

                    m_BossName.text = Language.Get("ElderGodMonster");

                    m_BossLevel.text = string.Empty;

                    m_RealmContainer.gameObject.SetActive(false);

                    break;

                case 2:

                    m_BossName.text = _name;

                    m_BossLevel.text = Language.Get("Z1024", _level);

                    if (m_Realm != null && m_RealmContainer != null)

                    {

                        if (Config.Instance.ContainKey<RealmConfig>(_realm))

                        {

                            m_RealmContainer.gameObject.SetActive(true);

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

                            if (realmConfig != null)

                            {

                                m_Realm.SetSprite(realmConfig.Img);

                            }

                        }

                        else

                        {

                            m_RealmContainer.gameObject.SetActive(false);

                        }

                    }

                    break;

                default:

                    break;

            }

        }



        protected override void OnSubscribe(int _bossId)

        {

            base.OnSubscribe(_bossId);