From ae044ded41371ce2b90938509f09c8bd1309112c Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 28 一月 2019 16:05:49 +0800
Subject: [PATCH] 5927 【前端】【1.5.100】XX巡礼支持活动配置

---
 Utility/EnumHelper.cs                                    |    6 ++++--
 System/OpenServerActivity/OpenServiceAchievementModel.cs |    7 +++++++
 System/OpenServerActivity/SpringFestivalModel.cs         |    4 ++--
 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs    |   17 +++++++----------
 System/OpenServerActivity/AchievementActivityWin.cs      |   17 +++++++++++++----
 5 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index c700ff2..0c62230 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -55,6 +55,7 @@
         CrossServerOneVsOneRewardModel m_CrossServerRewardModel;
         CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }
         OpenServiceAchievementModel OpenServerModel { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } }
+        SpringFestivalModel springFestival { get { return ModelCenter.Instance.GetModel<SpringFestivalModel>(); } }
         public void Init()
         {
             if (LatencyTimeList.Count <= 0)
@@ -119,18 +120,13 @@
 
         private void operationEndEvent(Operation arg1, int arg2)
         {
-            if (arg1 == Operation.FairyCeremony || arg1== Operation.NewYearFairyCeremony)
-            {
-                Classify();
-            }
+            Classify();
         }
 
         private void operationStartEvent(Operation arg1, int arg2)
         {
-            if (arg1 == Operation.FairyCeremony || arg1 == Operation.NewYearFairyCeremony)
-            {
-                Classify();
-            }
+            Classify();
+          
         }
 
         private void UpdateRedpoint(int redPointID)
@@ -656,8 +652,9 @@
                         }
                         else if (IndexOf == 4)
                         {
-                            bool Isopen = OpenServerModel.IsOpen;
-                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//7澶╁绀�
+                            bool Isopen = OpenServerModel.IsOpenFeatures();
+                            bool _isOpen = springFestival.IsOpenFeatures();
+                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && (Isopen || _isOpen))//7澶╁绀�
                             {
                                 if (AnimationFadeOutDicLow.Count < 6)//------绗簩灞�
                                 {
diff --git a/System/OpenServerActivity/AchievementActivityWin.cs b/System/OpenServerActivity/AchievementActivityWin.cs
index 4868842..46ab611 100644
--- a/System/OpenServerActivity/AchievementActivityWin.cs
+++ b/System/OpenServerActivity/AchievementActivityWin.cs
@@ -39,12 +39,13 @@
 
         protected override void OnPreOpen()
         {
+            OperationTimeHepler.Instance.operationStartEvent += operationStartEvent;
             IsButtonNumber();
             if (WindowCenter.Instance.IsOpen<MainInterfaceWin>())
             {
                 WindowCenter.Instance.Close<MainInterfaceWin>();
             }
-            if (openServiceAchievementModel.IsOpen)
+            if (openServiceAchievementModel.IsOpenFeatures())
             {
                 functionOrder = 0;
             }
@@ -60,9 +61,17 @@
         }
         protected override void OnAfterOpen()
         {
+            OperationTimeHepler.Instance.operationStartEvent -= operationStartEvent;
+        }
 
-        }
-
+        private void operationStartEvent(Operation arg1, int arg2)
+        {
+            if (arg1 == Operation.SpringFestival || arg1== Operation.OpenServiceAchievement)
+            {
+                IsButtonNumber();
+            }
+        }
+
         protected override void OnPreClose()
         {
             CloseChild();
@@ -131,7 +140,7 @@
         #endregion
         private void IsButtonNumber()
         {
-            if (openServiceAchievementModel.IsOpen)
+            if (openServiceAchievementModel.IsOpenFeatures())
             {
                 m_OpenServiceAchievementBtn.gameObject.SetActive(true);
             }
diff --git a/System/OpenServerActivity/OpenServiceAchievementModel.cs b/System/OpenServerActivity/OpenServiceAchievementModel.cs
index f667a83..1d5af20 100644
--- a/System/OpenServerActivity/OpenServiceAchievementModel.cs
+++ b/System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -627,6 +627,13 @@
         }
         return _bool;
     }
+    public bool IsOpenFeatures()
+    {
+        bool Isbool = false;
+        Isbool = (OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.OpenServiceAchievement)
+            || OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.OpenServiceAchievement));
+        return Isbool;
+    }
 }
 
 
diff --git a/System/OpenServerActivity/SpringFestivalModel.cs b/System/OpenServerActivity/SpringFestivalModel.cs
index 197ea61..6f33359 100644
--- a/System/OpenServerActivity/SpringFestivalModel.cs
+++ b/System/OpenServerActivity/SpringFestivalModel.cs
@@ -226,7 +226,7 @@
     public void SendGetSpringFestival(int day, int temdayplateID)//棰嗗彇鏄ヨ妭娲诲姩濂栧姳
     {
         CA504_tagCMPlayerGetReward getReward = new CA504_tagCMPlayerGetReward();
-        getReward.RewardType = (byte)GotServerRewardType.Def_RewardType_WeekPartyAct;
+        getReward.RewardType = (byte)GotServerRewardType.Def_RewardType_FeastWeekPartyAct;
         getReward.DataEx = (uint)day;
         string StrID = temdayplateID.ToString();
         getReward.DataExStrLen = (byte)StrID.Length;
@@ -236,7 +236,7 @@
     public void SendGetSpringFestivalPoint(int day, int point)//棰嗗彇鏄ヨ妭绉垎濂栧姳
     {
         CA504_tagCMPlayerGetReward getReward = new CA504_tagCMPlayerGetReward();
-        getReward.RewardType = (byte)GotServerRewardType.Def_RewardType_WeekPartyPoint;
+        getReward.RewardType = (byte)GotServerRewardType.Def_RewardType_FeastWeekPartyPoint;
         getReward.DataEx = (uint)day;
         string StrID = point.ToString();
         getReward.DataExStrLen = (byte)StrID.Length;
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index 1f506c5..a6b7d01 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -327,7 +327,7 @@
     GatherSoulDungeon = 30,
     CrossServerPk = 31,
     JadeDynastyBoss = 32,
-    JadeDynastyTower=33,
+    JadeDynastyTower = 33,
 }
 
 public enum ActivityPrepareType
@@ -1261,9 +1261,11 @@
     Def_RewardType_IceLodeStar = 19, //鍐版櫠鐭胯剦鏄熺骇濂栧姳19
     Def_RewardType_WeekPartyAct = 20, //棰嗗彇鍛ㄧ媯娆㈡椿鍔ㄥ鍔�20
     Def_RewardType_WeekPartyPoint = 21,// 棰嗗彇鍛ㄧ媯娆㈢Н鍒嗗鍔�21
-    Def_RewardType_ActLoginAwardAct=22,// 棰嗗彇鐧诲綍濂栧姳娲诲姩濂栧姳22
+    Def_RewardType_ActLoginAwardAct = 22,// 棰嗗彇鐧诲綍濂栧姳娲诲姩濂栧姳22
     Def_RewardType_NewFairyCRecharge = 23, // 鏂颁粰鐣岀洓鍏稿厖鍊煎ぇ绀�23
     Def_RewardType_NewFairyCParty = 24, // 鏂颁粰鐣岀洓鍏稿叏姘戞潵鍡�24
+    Def_RewardType_FeastWeekPartyAct = 25, //棰嗗彇鑺傛棩宸$ぜ娲诲姩濂栧姳25
+    Def_RewardType_FeastWeekPartyPoint = 26, //棰嗗彇鑺傛棩宸$ぜ绉垎濂栧姳26
 }
 
 public enum MapType

--
Gitblit v1.8.0