From 41a6e87783d042bf3e0ecebfa772443f2b5ed95d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 06 六月 2019 17:22:55 +0800
Subject: [PATCH] 7132 【2.0】【开发】打宝界面优化2

---
 System/CrossServerBoss/CrossServerBossBreifInfoBehaviour.cs |   60 +++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/System/CrossServerBoss/CrossServerBossBreifInfoBehaviour.cs b/System/CrossServerBoss/CrossServerBossBreifInfoBehaviour.cs
index 8c040b4..d9d12e4 100644
--- a/System/CrossServerBoss/CrossServerBossBreifInfoBehaviour.cs
+++ b/System/CrossServerBoss/CrossServerBossBreifInfoBehaviour.cs
@@ -34,10 +34,10 @@
                 {
                     case 1:
                     case 2:
-                        dieOrLocked = model.dogzDungeonBox.bigBoxSurplus <= 0;
+                        dieOrLocked = model.boxInfo.bigBoxSurplus <= 0;
                         break;
                     case 3:
-                        dieOrLocked = model.dogzDungeonElite.eliteSurplus <= 0;
+                        dieOrLocked = model.eliteInfo.eliteSurplus <= 0;
                         break;
                     case 4:
                         dieOrLocked = !model.IsBossUnLocked(bossId) || !findPreciousModel.IsBossAlive(bossId);
@@ -81,18 +81,18 @@
 
             model.boxSurplusChangeEvent -= OnBoxInfoUpdate;
             model.eliteSurplusChangeEvent -= OnGuardInfoUpdate;
-            model.dogzDungeonBox.refreshTimeEvent -= OnBoxRefreshTimeChange;
-            model.dogzDungeonElite.refreshTimeEvent -= OnEliteRefreshTimeChange;
+            model.boxInfo.refreshTimeEvent -= OnBoxRefreshTimeChange;
+            model.eliteInfo.refreshTimeEvent -= OnEliteRefreshTimeChange;
 
             switch (config.MonsterType)
             {
                 case 1:
                 case 2:
-                    model.dogzDungeonBox.refreshTimeEvent += OnBoxRefreshTimeChange;
+                    model.boxInfo.refreshTimeEvent += OnBoxRefreshTimeChange;
                     model.boxSurplusChangeEvent += OnBoxInfoUpdate;
                     break;
                 case 3:
-                    model.dogzDungeonElite.refreshTimeEvent += OnEliteRefreshTimeChange;
+                    model.eliteInfo.refreshTimeEvent += OnEliteRefreshTimeChange;
                     model.eliteSurplusChangeEvent += OnGuardInfoUpdate;
                     break;
             }
@@ -107,8 +107,8 @@
             model.bossSelectedEvent -= OnSelected;
             model.boxSurplusChangeEvent -= OnBoxInfoUpdate;
             model.eliteSurplusChangeEvent -= OnGuardInfoUpdate;
-            model.dogzDungeonBox.refreshTimeEvent -= OnBoxRefreshTimeChange;
-            model.dogzDungeonElite.refreshTimeEvent -= OnEliteRefreshTimeChange;
+            model.boxInfo.refreshTimeEvent -= OnBoxRefreshTimeChange;
+            model.eliteInfo.refreshTimeEvent -= OnEliteRefreshTimeChange;
         }
 
         protected override void UpdateBossRebornCoolDown(bool _isUnLocked)
@@ -121,10 +121,10 @@
                 {
                     case 1:
                     case 2:
-                        refreshTime = model.dogzDungeonBox.refreshTime;
+                        refreshTime = model.boxInfo.refreshTime;
                         break;
                     case 3:
-                        refreshTime = model.dogzDungeonElite.refreshTime;
+                        refreshTime = model.eliteInfo.refreshTime;
                         break;
                     case 4:
                         FindPreciousModel.BossInfo bossInfo;
@@ -171,8 +171,7 @@
             UpdateBossPortrait(interactorableState);
         }
 
-
-        protected override void DrawBossBaseInfo(string _icon, string _name, int _level, int _realm)
+        protected override void DrawBossBaseInfo(string icon, string name, int level, int realm)
         {
             var config = CrossServerBossConfig.Get(bossId);
             switch (config.MonsterType)
@@ -187,28 +186,39 @@
                     m_BossLevel.text = string.Empty;
                     break;
                 case 4:
-                    m_BossName.text = _name;
-                    m_BossLevel.text = Language.Get("Z1024", _level);
+                    m_BossName.text = name;
+                    m_BossLevel.text = Language.Get("Z1024", level);
                     break;
             }
 
-            m_Portrait.SetSprite(_icon);
+            m_Portrait.SetSprite(icon);
             m_Portrait.SetNativeSize();
 
-            if (m_Realm != null && m_RealmContainer != null)
+            m_RealmContainer.gameObject.SetActive(isUnLocked);
+            m_UnLockCondition.gameObject.SetActive(!isUnLocked);
+            if (!isUnLocked)
             {
-                if (_realm > 0 && RealmConfig.Has(_realm))
+                var unLockRealm = findPreciousModel.GetBossUnLockRealm(bossId);
+                var realmConfig = RealmConfig.Get(unLockRealm);
+                m_UnLockRealm.SetSprite(realmConfig.Img);
+            }
+            else
+            {
+                if (m_Realm != null && m_RealmContainer != null)
                 {
-                    m_RealmContainer.gameObject.SetActive(true);
-                    var realmConfig = RealmConfig.Get(_realm);
-                    if (realmConfig != null)
+                    if (realm > 0 && RealmConfig.Has(realm))
                     {
-                        m_Realm.SetSprite(realmConfig.Img);
+                        m_RealmContainer.gameObject.SetActive(true);
+                        var realmConfig = RealmConfig.Get(realm);
+                        if (realmConfig != null)
+                        {
+                            m_Realm.SetSprite(realmConfig.Img);
+                        }
                     }
-                }
-                else
-                {
-                    m_RealmContainer.gameObject.SetActive(false);
+                    else
+                    {
+                        m_RealmContainer.gameObject.SetActive(false);
+                    }
                 }
             }
         }

--
Gitblit v1.8.0