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

client_Hale

2019-04-12 37fe958376a003a36154bf9e4b456397f5c254b1

 System/FindPrecious/DemonJarWin.cs

@@ -25,6 +25,7 @@
        [SerializeField] TimerBehaviour m_CountRemainTime;

        [SerializeField] Button m_Goto;

        [SerializeField] Transform m_SurpassLevel;

        [SerializeField] RectTransform m_NoDamageTip;

        [SerializeField] ToggleButton m_Subscribe;



        [SerializeField] RectTransform m_ContainerDouble;

@@ -134,13 +135,13 @@


            DemonJarBossData bossData;

            model.TryGetBossData(model.selectedBoss, out bossData);

            var npcDropConfig = NPCDropItemConfig.Get(bossData.id);

            m_SurpassLevel.gameObject.SetActive(npcDropConfig.MaxLV != 0 && PlayerDatas.Instance.baseData.LV > npcDropConfig.MaxLV);

            m_Subscribe.isOn = findPreciousModel.IsBossSubscribed(model.selectedBoss);



            m_BossIntroduce.Display(model.selectedBoss, true);

            m_Bosses.Init(bosses);

            m_Bosses.MoveToCenter(bosses.IndexOf(model.selectedBoss));



            DisplayTip(model.selectedBoss);

        }



        private void ShowSkillRecord()

@@ -378,19 +379,18 @@
            return true;

        }



        private void OnBossSelected(int _bossId)

        private void OnBossSelected(int bossId)

        {

            m_BossIntroduce.Display(_bossId, false);

            m_Subscribe.isOn = findPreciousModel.IsBossSubscribed(_bossId);

            m_BossIntroduce.Display(bossId, false);

            m_Subscribe.isOn = findPreciousModel.IsBossSubscribed(bossId);



            DemonJarBossData bossData;

            model.TryGetBossData(_bossId, out bossData);

            var npcDropConfig = NPCDropItemConfig.Get(bossData.id);

            m_SurpassLevel.gameObject.SetActive(npcDropConfig.MaxLV != 0 && PlayerDatas.Instance.baseData.LV > npcDropConfig.MaxLV);

            model.TryGetBossData(bossId, out bossData);



            var demonJarConfig = DemonJarConfig.Get(model.selectedBoss);

            m_RewardDescription.text = Language.Get(demonJarConfig.RewardDescription);

            var config = DemonJarConfig.Get(model.selectedBoss);

            m_RewardDescription.text = Language.Get(config.RewardDescription);



            DisplayTip(bossId);

            DisplayAutoAndDoubleTitle();

        }



@@ -434,6 +434,26 @@
            }

        }



        private void DisplayTip(int bossId)

        {

            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            var config = NPCConfig.Get(bossId);



            if (config.Realm > realmLevel)

            {

                m_NoDamageTip.gameObject.SetActive(true);

                m_SurpassLevel.gameObject.SetActive(false);

            }

            else

            {

                m_NoDamageTip.gameObject.SetActive(false);

                var dropConfig = NPCDropItemConfig.Get(bossId);

                var noDrop = dropConfig == null || (dropConfig.MaxLV != 0 && PlayerDatas.Instance.baseData.LV > dropConfig.MaxLV);

                m_SurpassLevel.gameObject.SetActive(noDrop);

            }

        }





    }



}