From 5927cbc6a514576e5758cd166678805bb8ecb143 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 13 八月 2018 21:07:01 +0800
Subject: [PATCH] 2453 【前端】充值、福利、活动界面整合2

---
 System/OpenServerActivity/OpenServerActivityWin.cs |   51 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index b1a9880..1da679a 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -17,28 +17,22 @@
         Dictionary<int, bool> m_ActivitySpreadDict = new Dictionary<int, bool>();
 
         ImpactRankModel m_ImpactRankModel;
-        ImpactRankModel impactRankModel
-        {
-            get
-            {
+        ImpactRankModel impactRankModel {
+            get {
                 return m_ImpactRankModel ?? (m_ImpactRankModel = ModelCenter.Instance.GetModel<ImpactRankModel>());
             }
         }
 
         OSRedEnvelopeModel m_OSRedEnvelopeModel;
-        OSRedEnvelopeModel envelopeModel
-        {
-            get
-            {
+        OSRedEnvelopeModel envelopeModel {
+            get {
                 return m_OSRedEnvelopeModel ?? (m_OSRedEnvelopeModel = ModelCenter.Instance.GetModel<OSRedEnvelopeModel>());
             }
         }
 
         OSTimeLimitGiftModel m_OSTimeLimitGiftModel;
-        OSTimeLimitGiftModel timeLimitGiftModel
-        {
-            get
-            {
+        OSTimeLimitGiftModel timeLimitGiftModel {
+            get {
                 return m_OSTimeLimitGiftModel ?? (m_OSTimeLimitGiftModel = ModelCenter.Instance.GetModel<OSTimeLimitGiftModel>());
             }
         }
@@ -50,6 +44,7 @@
         MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } }
 
         MultipleRealmPointModel multipleRealmPointModel { get { return ModelCenter.Instance.GetModel<MultipleRealmPointModel>(); } }
+        BossRebornModel bossRebornModel { get { return ModelCenter.Instance.GetModel<BossRebornModel>(); } }
 
         List<int> openActivitys = new List<int>();
         List<int> activityReds = new List<int>();
@@ -183,6 +178,15 @@
                     activityReds.Add(1);
                 }
             }
+            if (OpenServerActivityCenter.Instance.IsBossRebornOpen())
+            {
+                openActivitys.Add(9);
+                if (bossRebornModel.bossRebornPoint.state == RedPointState.Simple)
+                {
+                    activityReds.Add(9);
+                }
+            }
+
             if (OpenServerActivityCenter.Instance.IsMultipleExpOpen())
             {
                 openActivitys.Add(5);
@@ -241,6 +245,11 @@
             if (OpenServerActivityCenter.Instance.IsMultipleRealmOpen())
             {
                 alreadyOpenActivitys.Add(8);
+            }
+
+            if (OpenServerActivityCenter.Instance.IsBossRebornOpen())
+            {
+                alreadyOpenActivitys.Add(9);
             }
         }
 
@@ -362,6 +371,7 @@
                     case 4:
                     case 5:
                     case 8:
+                    case 9:
                         m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
                         break;
                 }
@@ -463,6 +473,17 @@
                         WindowCenter.Instance.Open<NPracticePointWin>(true);
                     }
                     break;
+                case 9:
+                    if (windowState == WindowState.Opened)
+                    {
+                        WindowCenter.Instance.OpenWithoutAnimation<BossRebornWin>();
+                    }
+                    else
+                    {
+                        WindowCenter.Instance.Open<BossRebornWin>(true);
+                    }
+                    break;
+
             }
         }
 
@@ -491,6 +512,7 @@
             WindowCenter.Instance.CloseImmediately<ConsumeRebateWin>();
             WindowCenter.Instance.CloseImmediately<MultipleExpWin>();
             WindowCenter.Instance.CloseImmediately<NPracticePointWin>();
+            WindowCenter.Instance.CloseImmediately<BossRebornWin>();
         }
 
         private int Compare(int x, int y)
@@ -534,6 +556,11 @@
                     }
                     break;
                 case Operation.BossReborn:
+                    if (state == 0 && !alreadyOpenActivitys.Contains(9))
+                    {
+                        alreadyOpenActivitys.Add(9);
+                        UpdateFunctionBtns();
+                    }
                     break;
                 case Operation.GiftPackage:
                     break;

--
Gitblit v1.8.0