Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -71,5 +71,34 @@ namespace Assets.Game.HotUpdate.Data
             }
             return false;
         }
+
+        //新年拜访任务红点
+        public bool CheckVisitTaskRed(int npcID = 0)
+        {
+            if (npcID == 0)
+            {
+                for (int i = 0; i < ActivityVisitCfgArray.Instance.dataArray.Length - 1; i++)
+                {
+                    foreach (int j in ActivityVisitCfgArray.Instance.dataArray[i].taskIdArr)
+                    {
+                        if (TaskDataManager.Instance.GetTaskStateById(j) == 1)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                foreach (int j in ActivityVisitCfgArray.Instance.GetCfg(npcID).taskIdArr)
+                {
+                    if (TaskDataManager.Instance.GetTaskStateById(j) == 1)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
     }
 }

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

@@ -352,6 +352,9 @@ namespace GFGGame
         public bool CheckTeaPartyRewardCanGet()
         {
             var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
+            if (roleTeapartyInfo == null)
+                return false;
+
             //该活动暂未开启
             if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo && roleTeapartyInfo.IsNoActDayEnterLeague)
                 return false;

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

@@ -66,7 +66,7 @@ namespace GFGGame
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
             for (int i = 0; i < MiniGameDateManager.Instance.gameinfoList.Count; i++)
             {
-                if (MiniGameDateManager.Instance.gameinfoList[i].GameType == 2 && MiniGameDateManager.Instance.gameinfoList[i].FirstPassRewardStatus != response.GameInfo.FirstPassRewardStatus)
+                if (MiniGameDateManager.Instance.gameinfoList[i].GameId == response.GameInfo.GameId)
                 {
                     MiniGameDateManager.Instance.gameinfoList[i] = response.GameInfo;
                     break;

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaMainView.cs

@@ -48,7 +48,7 @@ namespace GFGGame
             base.OnShown();
             _ui.m_Bg.url = ResPathUtil.GetBgImgPath("gfxwc_zymbj");
             _ui.m_BgOne.url = ResPathUtil.GetBgImgPath("gfxwc_zjmlp");
-            RedDotController.Instance.SetComRedDot(_ui.m_twoViewIcon, ActivityTeaDataManager.Instance.GetRewardRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_twoViewIcon, ActivityTeaDataManager.Instance.GetRewardRed()|| ActivityTeaDataManager.Instance.CheckVisitTaskRed());
             RedDotController.Instance.SetComRedDot(_ui.m_oneViewIcon, ActivityTeaDataManager.Instance.CheckHRDRed(),"",-85);
             RedDotController.Instance.SetComRedDot(_ui.m_threeViewIcon, ActivityTeaDataManager.Instance.GetActivitySyntheticRed(),"",-85);
         }

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaVisitView.cs

@@ -136,7 +136,7 @@ namespace GFGGame
             if (item.m_visitBtn.target.visible == true)
             {
                 item.m_visitBtn.m_c1.selectedIndex = ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 1 ? 1 : 0;
-                RedDotController.Instance.SetComRedDot(item.m_visitBtn.target, (ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 1 && time > 0) || ActivityTeaDataManager.Instance.NpcInfoList[index].RewrdStatus == 1);
+                RedDotController.Instance.SetComRedDot(item.m_visitBtn.target, (ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 1 && time > 0) || ActivityTeaDataManager.Instance.NpcInfoList[index].RewrdStatus == 1 ||ActivityTeaDataManager.Instance.CheckVisitTaskRed(index+1));
             }
             if(item.m_visitBtn.target.data == null)
             {

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityVisitNpcView.cs

@@ -162,6 +162,7 @@ namespace GFGGame
             var tasks = (List<TaskCfg>)obj.parent.data;
             var taskCfg = tasks[index];
             item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(taskCfg.id);
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt.target, TaskDataManager.Instance.GetTaskStateById(taskCfg.id) == 1?true:false);
             if (taskCfg.jumpId == "" && TaskDataManager.Instance.GetTaskStateById(taskCfg.id) == 0)
             {
                 item.m_c2.selectedIndex = taskCfg.jumpId == "" ? 1 : 0;

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

@@ -948,7 +948,7 @@ namespace GFGGame
             if (_ui.m_btnTea.target.visible)
             {
                 if (redPointUpdateFrame == 19)
-                    RedDotController.Instance.SetComRedDot(_ui.m_btnTea.target, ActivityTeaDataManager.Instance.GetRewardRed() || ActivityTeaDataManager.Instance.CheckHRDRed() || ActivityTeaDataManager.Instance.GetActivitySyntheticRed(), "", -24, -3);
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnTea.target, ActivityTeaDataManager.Instance.GetRewardRed() || ActivityTeaDataManager.Instance.CheckHRDRed() || ActivityTeaDataManager.Instance.GetActivitySyntheticRed() || ActivityTeaDataManager.Instance.CheckVisitTaskRed(), "", -24, -3);
             }
             // 招财进宝活动
             if (_ui.m_btnActivityZCJB.target.visible)