From a2f60684672fa50c8793e9f548ccf57e23fc15e5 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 12 四月 2019 14:15:22 +0800
Subject: [PATCH] 6490 【2.0】【前端】打宝界面和境界压制调整

---
 System/CrossServerBoss/CrossServerBossWin.cs |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/System/CrossServerBoss/CrossServerBossWin.cs b/System/CrossServerBoss/CrossServerBossWin.cs
index 4e929c2..cfcb6d2 100644
--- a/System/CrossServerBoss/CrossServerBossWin.cs
+++ b/System/CrossServerBoss/CrossServerBossWin.cs
@@ -24,6 +24,7 @@
         [SerializeField] ImageEx m_ImageGoto;
         [SerializeField] Button m_KillRecord;
         [SerializeField] Transform m_SurpassLevel;
+        [SerializeField] RectTransform m_NoDamageTip;
         [SerializeField] ToggleButton m_Subscribe;
 
         [SerializeField] RectTransform m_ContainerBoxCollectWeary;
@@ -33,8 +34,6 @@
 
         CrossServerBossModel model { get { return ModelCenter.Instance.GetModel<CrossServerBossModel>(); } }
         FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }
-        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
-        BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }
 
         #region Built-in
         protected override void BindController()
@@ -85,7 +84,7 @@
 
             DisplayItemDropTip(model.selectedBoss);
             DisplayBossBaseInfo(model.selectedBoss);
-            DisplayWearyValue(model.selectedBoss);
+            DisplayTimes(model.selectedBoss);
         }
 
         private void ShowKillRecords()
@@ -149,7 +148,7 @@
         {
             DisplayItemDropTip(_bossId);
             DisplayBossBaseInfo(_bossId);
-            DisplayWearyValue(_bossId);
+            DisplayTimes(_bossId);
         }
 
         private void DisplayBossBaseInfo(int _bossId)
@@ -191,26 +190,40 @@
             }
         }
 
-        private void DisplayItemDropTip(int _bossId)
+        private void DisplayItemDropTip(int bossId)
         {
-            var config = CrossServerBossConfig.Get(model.selectedBoss);
+            var config = CrossServerBossConfig.Get(bossId);
             switch (config.MonsterType)
             {
                 case 1:
                 case 2:
                 case 3:
+                    m_NoDamageTip.gameObject.SetActive(true);
                     m_SurpassLevel.gameObject.SetActive(false);
                     break;
                 case 4:
-                    var npcDropConfig = NPCDropItemConfig.Get(_bossId);
-                    m_SurpassLevel.gameObject.SetActive(npcDropConfig.MaxLV != 0 && PlayerDatas.Instance.baseData.LV > npcDropConfig.MaxLV);
+                    var realmLevel = PlayerDatas.Instance.baseData.realmLevel;
+                    var npcConfig = NPCConfig.Get(bossId);
+
+                    if (npcConfig.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);
+                    }
                     break;
             }
         }
 
-        private void DisplayWearyValue(int _bossId)
+        private void DisplayTimes(int bossId)
         {
-            var config = CrossServerBossConfig.Get(model.selectedBoss);
+            var config = CrossServerBossConfig.Get(bossId);
             switch (config.MonsterType)
             {
                 case 1:

--
Gitblit v1.8.0