| System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/AchievementActivityWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServiceAchievementModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/SpringFestivalModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/EnumHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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(); } } private void operationStartEvent(Operation arg1, int arg2) { if (arg1 == Operation.FairyCeremony || arg1 == Operation.NewYearFairyCeremony) { 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)//------第二层 { 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,7 +61,15 @@ } 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() @@ -131,7 +140,7 @@ #endregion private void IsButtonNumber() { if (openServiceAchievementModel.IsOpen) if (openServiceAchievementModel.IsOpenFeatures()) { m_OpenServiceAchievementBtn.gameObject.SetActive(true); } 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; } }
@@ -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; Utility/EnumHelper.cs
@@ -1264,6 +1264,8 @@ 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
