新年签到

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -259,6 +259,7 @@ namespace GFGGame
             LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo().Coroutine();
             LeagueSproxy.GetTeapartyInfos().Coroutine();
             LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId).Coroutine();
+            ActivitySProxy.ReqGetActivitySignInfos().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -267,5 +267,13 @@ namespace GFGGame
             }
             return false;
         }
+
+        /**********************************************************每日登录修改*************************************************/
+        /// <summary>
+        /// 新年签到 登录第几天列表  奖励状态列表
+        /// </summary>
+        /// <value></value>
+        public Dictionary<int,int> NewYearLoginInfoDic = new Dictionary<int, int>();
+
     }
 }

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -274,7 +274,53 @@ namespace GFGGame
             }
             return false;
         }
+        /**********************************************************新年签到*************************************************/
+       
+        public static async ETTask<bool> ReqGetActivitySignInfos()
+        {
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.ShenDuChenYou);
+            ET.Log.Debug("打印测试=========新年签到收到协议返回======="+ activityId +"=="+ ActivitySignCfgArray.Instance.GetCfgsByactivityId(activityId).Count);
+
+            if (activityId < 0 || ActivitySignCfgArray.Instance.GetCfgsByactivityId(activityId).Count <= 0 )
+                return false;
+            ET.Log.Debug("打印测试=========新年签到收到协议返回===888====");
+
+            S2C_GetActivitySignInfos response = null;
+            response = (S2C_GetActivitySignInfos)await MessageHelper.SendToServer(new C2S_GetActivitySignInfos() { ActivityId = activityId });
+            if (response != null)
+            {
+                ET.Log.Debug("打印测试=========新年签到收到协议返回===6666====");
+
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ET.Log.Debug("打印测试=========新年签到收到协议返回=======");
+                    for(int i = 0;i< response.ksDay.Count; i++) { 
+                        ActivityDataManager.Instance.NewYearLoginInfoDic.Add(response.ksDay[i], response.vsStatus[i]);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
 
+        public static async ETTask<bool> ReqGetAcitivitySignBonus(int activityId)
+        {
+            S2C_ReqGetAcitivitySignBonus response = null;
+            response = (S2C_ReqGetAcitivitySignBonus)await MessageHelper.SendToServer(new C2S_ReqGetAcitivitySignBonus() { ActivityId = activityId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ET.Log.Debug("打印测试=========领取新年签到收到协议返回======="+ response.Day);
+                    ActivityDataManager.Instance.NewYearLoginInfoDic[response.Day] = ConstBonusStatus.GOT;
+                    int[][] rewards = ActivitySignCfgArray.Instance.GetCfgByactivityIdAndday(activityId,response.Day).bonusArr;
+                    BonusController.TryShowBonusList(rewards);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }
 

GameClient/Assets/Game/HotUpdate/ServerProxy/CommonSProxy.cs

@@ -64,6 +64,7 @@ namespace GFGGame
                     await ActivityAfuGiftSProxy.GetAfuGiftInfo();
                     await ActivityTeaSProxy.ReqGetNPCVisitInfo();
                     await MiniGameProxy.ReqGetChallengeReward();
+                    ActivitySProxy.ReqGetActivitySignInfos().Coroutine();
                     ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
                     ActivityDataManager.Instance.todayMonthlyCardTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity);
                     EventAgent.DispatchEvent(ConstMessage.RESET_DAILY_DATA);

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -353,12 +353,15 @@ namespace GFGGame
 
         private void OnClickBtnXiuFang()
         {
-            if (isOpen) return;
-            isOpen = true;
-            _ui.m_btnXiuFang.m_holder1.visible = true;
-            _ui.m_btnXiuFang.m_holder1.visible = false;
-            ViewManager.Show<XiuFangView>();
-            isOpen = false;
+            ViewManager.Show<NewYearLoginView>();
+
+
+            //if (isOpen) return;
+            //isOpen = true;
+            //_ui.m_btnXiuFang.m_holder1.visible = true;
+            //_ui.m_btnXiuFang.m_holder1.visible = false;
+            //ViewManager.Show<XiuFangView>();
+            //isOpen = false;
         }
 
         private void OnClickBtnDailyLogin()

GameClient/Assets/Game/HotUpdate/Views/NewYearLogin/NewYearLoginView.cs

@@ -9,6 +9,7 @@ namespace GFGGame
     public class NewYearLoginView : BaseWindow
     {
         private UI_NewYearLoginUI _ui;
+        private int _activityId = 0;
 
         public override void Dispose()
         {
@@ -29,68 +30,74 @@ namespace GFGGame
             this.viewCom.Center();
             this.modal = true;
             //viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
-
             _ui.m_listLogin.itemRenderer = RenderListLogin;
-            //_ui.m_btnOpen.onClick.Add(OnClickBtnOpen);
-            //_ui.m_btnDoubleGet.target.onClick.Add(OnClickBtnDoubleGet);
         }
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_listLogin.numItems = ActivitySignCfgArray.Instance.dataArray.Length;   
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.ShenDuChenYou);
+            ET.Log.Debug("´òÓ¡²âÊÔ============6666666666666===="+ _activityId);
+
+            RefreshViewInfo();
         }
 
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshViewInfo);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshViewInfo);
         }
 
         private void RefreshViewInfo()
         {
-            //_ui.m_btnDoubleGet.target.visible = NewYearRedEnvelopeDataManager.Status != RedPacketStatus.Double;
+            ET.Log.Debug("´òÓ¡²âÊÔ====fsdfafd============" + ActivitySignCfgArray.Instance.GetCfgsByactivityId(_activityId).Count);
+            _ui.m_listLogin.numItems = ActivitySignCfgArray.Instance.GetCfgsByactivityId(_activityId).Count;
         }
 
         private void RenderListLogin(int index, GObject obj)
         {
             UI_ComLoginItem item = UI_ComLoginItem.Proxy(obj);
-            var cfg = ActivitySignCfgArray.Instance.dataArray[index].bonusArr;
+            var data = ActivitySignCfgArray.Instance.GetCfgsByactivityId(_activityId);
+            var cfg = data[index].bonusArr;
             item.m_bgType.selectedIndex = index % 2;
 
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg[0][0]);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             item.m_txtName.text = itemCfg.name;
             item.m_txtNum.text = "x" + NumberUtil.ChangeNumberUnit(cfg[0][1], 10000);
-            item.m_imgGot.visible = ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg[0][0] - 1] == ConstBonusStatus.GOT;
-            // if (cfg.id == dailyLoginId)
-            // {
-            RedDotController.Instance.SetComRedDot(item.target, ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg[0][0] - 1] == ConstBonusStatus.CAN_GET);
-            // }
+            ActivityDataManager.Instance.NewYearLoginInfoDic.TryGetValue(index + 1, out var state);
+            item.m_imgGot.visible = state == ConstBonusStatus.GOT;
+            RedDotController.Instance.SetComRedDot(item.target, state == ConstBonusStatus.CAN_GET);
             if (item.target.data == null)
             {
-                //item.target.onClick.Add(OnListItemClick);
+                item.target.onClick.Add(OnListItemClick);
             }
             item.target.data = cfg;
             UI_ComLoginItem.ProxyEnd();
         }
 
-        private void OnClickBtnOpen(EventContext context)
-        {
-            ReqLeagueList();
-        }
 
-        private async void ReqLeagueList()
+        private async void OnListItemClick(EventContext context)
         {
-            int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
-            bool result = await NewYearRedEnvelopeSProxy.ReqOpenRedPacket(actRedPacketId);
-            if (result)
+            DailyLoginCfg cfg = (context.sender as GObject).data as DailyLoginCfg;
+
+            if (ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.id - 1] == ConstBonusStatus.CAN_GET)
+            {
+                int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+
+                bool result = await ActivitySProxy.ReqGetAcitivitySignBonus(actRedPacketId);
+                if (result)
+                {
+                    //LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 2);
+                    RefreshViewInfo();
+                }
+            }
+            else
             {
+                GoodsItemTipsController.ShowItemTips(cfg.rewardsArr[0][0]);
             }
         }