贵妇下午茶的合成加红点

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

@@ -79,5 +79,25 @@ namespace Assets.Game.HotUpdate.Data
                 return false;
             }
         }
+
+        //合成红点
+        public bool GetActivitySyntheticRed()
+        {
+            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.ItemSynthetic))
+            {
+                return false;
+            }
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.ItemSynthetic);
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
+            var suitCfg = SuitCfgArray.Instance.GetCfg(activityOpenCfg.paramsArr[0]);
+            for (int i = 0; i < suitCfg.partsArr.Length; i++)
+            {
+                ItemCfg itemSyntheticCfg = ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[i]);
+                var materiarsArr = itemSyntheticCfg.syntheticMateriarsArr;
+                if (ItemDataManager.GetItemNum(materiarsArr[0][0]) >= materiarsArr[0][1] && ItemDataManager.GetItemNum(materiarsArr[1][0]) >= materiarsArr[1][1])
+                    return true;
+            }
+            return false;
+        }
     }
 }

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

@@ -45,7 +45,8 @@ namespace GFGGame
         {
             base.OnShown();
 
-            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(5005);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.ItemSynthetic);
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
             _suitCfg = SuitCfgArray.Instance.GetCfg(activityOpenCfg.paramsArr[0]);
             ItemCfg itemSyntheticCfg = ItemCfgArray.Instance.GetCfg(_suitCfg.partsArr[0]);
             _valueBarController.OnShown();
@@ -97,7 +98,8 @@ namespace GFGGame
 
         private void RefreshTimeText()
         {
-            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(5005);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.ItemSynthetic);
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
             long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
             string strTime = TimeUtil.FormattingTimeTo_DDHHmm(time);
             _ui.m_txtTime.text = "剩余:" + strTime;
@@ -163,6 +165,8 @@ namespace GFGGame
 
                 comBox.m_btnGet.data = index;
             }
+            RedDotController.Instance.SetComRedDot(comBox.m_btnMake, comBox.m_btnType.selectedIndex == 1);
+
             UI_SyntheticItemUI.ProxyEnd();
         }
 
@@ -170,7 +174,8 @@ namespace GFGGame
         {
             if (!(context.sender is GObject obj)) return;
             int itemID = (int)obj.data;
-            bool result = await ActivityTeaSProxy.ReqItemSynthetic( 5005 , itemID);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.ItemSynthetic);
+            bool result = await ActivityTeaSProxy.ReqItemSynthetic(activityInfo.ActivityId, itemID);
             if (result)
             {
                 _ui.m_listSynthetic.numItems = _suitCfg.partsArr.Length;

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

@@ -50,6 +50,7 @@ namespace GFGGame
             _ui.m_BgOne.url = ResPathUtil.GetBgImgPath("gfxwc_zjmlp");
             RedDotController.Instance.SetComRedDot(_ui.m_twoViewIcon, ActivityTeaDataManager.Instance.GetRewardRed());
             RedDotController.Instance.SetComRedDot(_ui.m_oneViewIcon, ActivityTeaDataManager.Instance.CheckHRDRed(),"",-85);
+            RedDotController.Instance.SetComRedDot(_ui.m_threeViewIcon, ActivityTeaDataManager.Instance.GetActivitySyntheticRed(),"",-85);
         }
 
         protected override void OnHide()
@@ -108,8 +109,8 @@ namespace GFGGame
                 return;
             }
 
-                //合成入口
-                ViewManager.Show<ActivitySyntheticView>();
+            //合成入口
+            ViewManager.Show<ActivitySyntheticView>();
         }
 
     }

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

@@ -945,7 +945,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(), "", -24, -3);
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnTea.target, ActivityTeaDataManager.Instance.GetRewardRed() || ActivityTeaDataManager.Instance.CheckHRDRed() || ActivityTeaDataManager.Instance.GetActivitySyntheticRed(), "", -24, -3);
             }
             // 招财进宝活动
             if (_ui.m_btnActivityZCJB.target.visible)