| System/MainInterfacePanel/HighSettingTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServiceAchievementCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServiceAchievementModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServiceAchievementWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/EnumHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/MainInterfacePanel/HighSettingTip.cs
@@ -52,6 +52,7 @@ [SerializeField] Button m_AllThePeopleBtn;//全民冲榜 [SerializeField] Button m_FlashRushBtn;//限时抢购 [SerializeField] Button m_CrossServerBtn;//跨服1V1按钮 [SerializeField] Button m_OpenServiceBtn;//周狂欢按钮 private bool _bool = true; private int swicthCdTime = 0; private bool IsFadeOut = true; @@ -94,6 +95,7 @@ m_AllThePeopleBtn.AddListener(OnClickmAllThePeopleBtn); m_FlashRushBtn.AddListener(OnClickFlashRushBtn); m_CrossServerBtn.AddListener(OnClickCrossServerBtn); m_OpenServiceBtn.AddListener(OnClickOpenServiceBtn); if (_bool) { ColseButton(); @@ -383,7 +385,11 @@ } } void OnClickOpenServiceBtn() { WindowCenter.Instance.Open<OpenServiceAchievementWin>(); } public void ShowButton()//向上 {
@@ -81,12 +81,26 @@ } else//已过的天数 { if (WeekPartyAction.SingleTimes > carryOutNum)//未到达 int TaypeNumber = 0; if (carryOutNum - rewardNum > 0) { m_Btn.gameObject.SetActive(false); TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes; } if (TaypeNumber > 0)//可领 { m_Btn.gameObject.SetActive(true); UIEffect uieffect = m_Btn.GetComponent<UIEffect>(); uieffect.Play(); m_BtnText.text = Language.Get("RealmPractice109");//领取 m_Miss.SetActive(false); m_Reach.SetActive(true); m_Reach.SetActive(false); m_Draw.SetActive(false); m_Btn.SetListener(() => { model.SendGetWeekParty(model.SelectedNow, ID); DebugEx.LogError("-----------------------------"); }); } else { @@ -97,33 +111,38 @@ m_Reach.SetActive(false); m_Draw.SetActive(true); } else//还未领取 else//未到达 { m_Btn.gameObject.SetActive(true); m_BtnText.text = Language.Get("RealmPractice109");//领取 m_Btn.gameObject.SetActive(false); m_Miss.SetActive(false); m_Reach.SetActive(false); m_Reach.SetActive(true); m_Draw.SetActive(false); m_Btn.SetListener(()=> { DebugEx.LogError("-----------------------------"); }); } } } } else//当前天 { if (WeekPartyAction.SingleTimes > carryOutNum)//未到达(前往) int TaypeNumber = 0; if (carryOutNum - rewardNum > 0) { TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes; } if (TaypeNumber > 0)//可领 { m_Btn.gameObject.SetActive(true); m_BtnText.text = Language.Get("RealmPractice108");//前往 UIEffect uieffect = m_Btn.GetComponent<UIEffect>(); uieffect.Play(); m_BtnText.text = Language.Get("RealmPractice109");//领取 m_Miss.SetActive(false); m_Reach.SetActive(false); m_Draw.SetActive(false); m_Btn.SetListener(() => { WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump); model.SendGetWeekParty(model.SelectedNow, ID); DebugEx.LogError("-----------------------------"); }); } else @@ -135,16 +154,18 @@ m_Reach.SetActive(false); m_Draw.SetActive(true); } else//还未领取 else//未到达(前往) { m_Btn.gameObject.SetActive(true); m_BtnText.text = Language.Get("RealmPractice109");//领取 m_BtnText.text = Language.Get("RealmPractice108");//前往 UIEffect uieffect = m_Btn.GetComponent<UIEffect>(); uieffect.Stop(); m_Miss.SetActive(false); m_Reach.SetActive(false); m_Draw.SetActive(false); m_Btn.SetListener(() => { DebugEx.LogError("-----------------------------"); WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump); }); } } System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -204,6 +204,7 @@ WeekPartyItem.ItemCnt = (int)item.ItemCnt; WeekPartyItem.IsBind = item.IsBind; WeekPartyItem.NeedPoint = 0; WeekPartyAction.WeekPartyItem[z] = WeekPartyItem; } if (WeekPartyActionDic.ContainsKey((int)ActionInfo.TemplateID)) { @@ -214,6 +215,7 @@ WeekPartyActionDic.Add((int)ActionInfo.TemplateID, WeekPartyAction); } }// 活动模板信息 GetDayNow(); if (WeekPartyUpdate != null) { WeekPartyUpdate(); @@ -271,13 +273,39 @@ { int Day = 0; var time = TimeDayBeginAndOver[0]; if (TimeDayBeginAndOver.Length <= 0 || time==null) { return; } DateTime time1 = new DateTime(time.Year, time.Month, time.Day); DateTime time2 = new DateTime(TimeUtility.ServerNow.Year, TimeUtility.ServerNow.Month, TimeUtility.ServerNow.Day); TimeSpan ts = time2.Subtract(time1); Day = (int)ts.TotalDays; DebugEx.LogError("输出当前的天数"+ Day); DayNow = Day; } public void SendGetWeekParty(int day,int temdayplateID)//领取周狂欢活动奖励 { CA504_tagCMPlayerGetReward getReward = new CA504_tagCMPlayerGetReward(); getReward.RewardType = (byte)GotServerRewardType.Def_RewardType_WeekPartyAct; getReward.DataEx = (uint)day; string StrID = temdayplateID.ToString(); getReward.DataExStrLen = (byte)StrID.Length; getReward.DataExStr = StrID; GameNetSystem.Instance.SendInfo(getReward); } public void SendGetWeekPartyPoint(int day, int point)//领取周狂欢积分奖励 { CA504_tagCMPlayerGetReward getReward = new CA504_tagCMPlayerGetReward(); getReward.RewardType = (byte)GotServerRewardType.Def_RewardType_WeekPartyPoint; getReward.DataEx = (uint)day; string StrID = point.ToString(); getReward.DataExStrLen = (byte)StrID.Length; getReward.DataExStr = StrID; GameNetSystem.Instance.SendInfo(getReward); } }
@@ -18,7 +18,8 @@ { [SerializeField] ScrollerController m_ScrollerController1;//天 [SerializeField] ScrollerController m_ScrollerController2;//列表 private int InDay; [SerializeField] Button m_CloseBtn; [SerializeField] Text m_TextIntegral;//当前积分 #region Built-in OpenServiceAchievementModel model { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } } List<int> SortList = new List<int>(); @@ -31,10 +32,13 @@ protected override void AddListeners() { m_CloseBtn.AddListener(()=> { Close(); }); } protected override void OnPreOpen() { model.SelectedNow = model.DayNow; SetTextIntegral(); OnCreateGridLineCell1(m_ScrollerController1); OnCreateGridLineCell2(m_ScrollerController2); } @@ -62,9 +66,9 @@ void OnCreateGridLineCell1(ScrollerController gridCtrl) { gridCtrl.Refresh(); for (int i = 0; i < 8; i++) foreach (var key in model.WeekPartyDayDic.Keys) { gridCtrl.AddCell(ScrollerDataType.Header,i); gridCtrl.AddCell(ScrollerDataType.Header, key); } gridCtrl.Restart(); } @@ -75,7 +79,7 @@ GameObject SelectedObj = cell.transform.Find("Image_XZ").gameObject;//选中 GameObject Unselected = cell.transform.Find("Image_WXZ").gameObject;//未选中 Text DayText = cell.transform.Find("DayText").GetComponent<Text>();//天数 if (Index == InDay) if (Index == model.SelectedNow) { SelectedObj.SetActive(true); Unselected.SetActive(false); @@ -88,10 +92,10 @@ DayText.text = InDayStr(Index); Btn.SetListener(()=> { if (Index != InDay) if (Index != model.SelectedNow) { InDay = Index; model.SelectedNow = InDay;//选中天 model.SelectedNow = Index;//选中天 SetTextIntegral(); OnCreateGridLineCell2(m_ScrollerController2); m_ScrollerController1.m_Scorller.RefreshActiveCellViews();//刷新可见 } @@ -102,19 +106,6 @@ { string DaySte = string.Empty; DaySte = Language.Get("SignIn_4",Day); //switch (Day) //{ // case 1: // return DaySte; // case 2: // return DaySte; // case 3: // return DaySte; // case 4: // return DaySte; // case 5: // return DaySte; //} return DaySte; } //------------------------------- @@ -122,9 +113,9 @@ { ToAddSorting();//排序 gridCtrl.Refresh(); for (int i = 0; i < 8; i++) for (int i = 0; i < SortList.Count; i++) { gridCtrl.AddCell(ScrollerDataType.Header, i); gridCtrl.AddCell(ScrollerDataType.Header, SortList[i]); } gridCtrl.Restart(); } @@ -185,7 +176,12 @@ int number = WeekPartyAction.TotalTimes / WeekPartyAction.SingleTimes; int rewardNum = model.GetRewardNumber(model.SelectedNow, ID);//已领奖次数 int carryOutNum = model.GetCarryOutNum(model.SelectedNow, ID);//已完成次数 if (carryOutNum >= WeekPartyAction.SingleTimes && number > rewardNum) int TaypeNumber = 0; if (carryOutNum - rewardNum > 0) { TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes; } if (TaypeNumber>0) { Bool = true; } @@ -201,7 +197,12 @@ int number = WeekPartyAction.TotalTimes / WeekPartyAction.SingleTimes; int rewardNum = model.GetRewardNumber(model.SelectedNow, ID);//已领奖次数 int carryOutNum = model.GetCarryOutNum(model.SelectedNow, ID);//已完成次数 if (WeekPartyAction.SingleTimes > carryOutNum) int TaypeNumber = 0; if (carryOutNum - rewardNum > 0) { TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes; } if (TaypeNumber<=0) { Bool = true; } @@ -234,6 +235,12 @@ } return index; } private void SetTextIntegral()//获取当前积分 { int Point = model.GetPoint(model.SelectedNow); m_TextIntegral.text = Point.ToString(); } } } Utility/EnumHelper.cs
@@ -1194,7 +1194,9 @@ Def_RewardType_WishingWell = 16,// 许愿池奖励16 Def_RewardType_OpenFunc = 17,//功能预告奖励 Def_RewardType_TotalRecharge = 18,//累计充值奖励 Def_RewardType_IceLodeStar, //冰晶矿脉星级奖励19 Def_RewardType_IceLodeStar=19, //冰晶矿脉星级奖励19 Def_RewardType_WeekPartyAct=20, //领取周狂欢活动奖励20 Def_RewardType_WeekPartyPoint=21,// 领取周狂欢积分奖励21 }
