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

* 'master' of http://10.108.64.190:3000/gfg/Client:
  雅集清数据
  替换资源
  黑金单品红点
  限时主题活动红点

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

@@ -184,6 +184,7 @@ namespace GFGGame
             LimitedTimeGiftBoxDataManager.Instance.Clear();
             BattlePassTaskDataManager.Instance.Clear();
             TaskDataManager.Instance.Clear();
+            LeagueDataManager.Instance.Clear();
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();

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

@@ -41,6 +41,7 @@ namespace GFGGame
             ListLogDatas.Clear();
             ListAnsweringDatas.Clear();
             LastAnswerRoleData = null;
+            LeagueNumber.Clear();
         }
         public void SetNumeric(int type, long value)
         {
@@ -197,6 +198,7 @@ namespace GFGGame
                         isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareSuperDay) == 1;
                         break;
                 }
+                // ET.Log.Debug("isBuy:" + isBuy);
                 if (isBuy)
                 {
                     LeagueGiftGetData giftGetData = new LeagueGiftGetData();

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

@@ -350,7 +350,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetShopRed()
         {
-            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed();
+            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed();
         }
         //商店-充值-会员中心
         public bool GetChargeAddUpRewardRed()
@@ -398,6 +398,19 @@ namespace GFGGame
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold) && GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldReward) <= 0;
         }
         /// <summary>
+        /// 商城-月卡-黑金卡-单品奖励
+        /// </summary>
+        /// <returns></returns>
+        public bool GetBlackCardClothingRed()
+        {
+            int _year = TimeUtil.GetCurYear();
+            int _month = TimeUtil.GetCurMonth();
+            MonthlyCardClothesCfg clothesCfg = MonthlyCardClothesCfgArray.Instance.GetCfgByyearAndmonth(_year, _month);
+
+            return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold) && !MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth), _month);
+        }
+
+        /// <summary>
         /// 联盟-成员申请
         /// </summary>
         /// <returns></returns>
@@ -456,6 +469,21 @@ namespace GFGGame
             }
             return false;
         }
+        /// <summary>
+        /// 限时抽奖活动任务奖励
+        /// </summary>
+        /// <returns></returns>
+        public bool GetActLuckyBoxTaskdRed()
+        {
+            if (ActivityDataManager.Instance.actLuckyBoxId <= 0) return false;
+            List<TaskCfg> _bonueCfgs = TaskDataManager.Instance.GetTaskCfgs(TaskType.LuckyBoxActivity);
+            for (int i = 0; i < _bonueCfgs.Count; i++)
+            {
+                int state = TaskDataManager.Instance.GetTaskStateById(_bonueCfgs[i].id);
+                if (state == ConstBonusStatus.CAN_GET) return true;
+            }
+            return false;
+        }
 
         /// <summary>
         /// 摘星-每日特惠

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -101,7 +101,7 @@ namespace GFGGame
         }
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnLuckyBox, RedDotDataManager.Instance.GetMeiRiTeHuiRed() ||RedDotDataManager.Instance.GetActLuckyBoxRewardRed(), "", -90, 70);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnLuckyBox, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -90, 70);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -287,6 +287,7 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnShop, RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -18, 11);
             RedDotController.Instance.SetComRedDot(_ui.m_btnGiftBag, RedDotDataManager.Instance.GetMeiRiTeHuiRed(), "", -18, 11);
         }
 

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

@@ -1020,7 +1020,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -38);
             RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueMemberJoinRed() || LeagueDataManager.Instance.Type == LeagueJoinType.UnJoin || RedDotDataManager.Instance.GetLeagueGiftBoxRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetLimiteChargeRewardRed(), "", -10, 5);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target,RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed(), "", -10, 5);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -10, 5);
             RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
         }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs

@@ -196,6 +196,9 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_btnGet, menu2 == ConstStoreSubId.STORE_MONTH_GOLD_CARD && RedDotDataManager.Instance.GetGoldCardRewardRed() || menu2 == ConstStoreSubId.STORE_MONTH_BLACK_CARD && RedDotDataManager.Instance.GetBlackCardRewardRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnBlackReward, menu2 == ConstStoreSubId.STORE_MONTH_BLACK_CARD && RedDotDataManager.Instance.GetBlackCardClothingRed(), "", -10, 5);
+
+
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -213,11 +213,11 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_CHARGE_ADDUP).asCom, RedDotDataManager.Instance.GetChargeAddUpRewardRed());
             }
 
-            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetGoldCardRewardRed() || RedDotDataManager.Instance.GetBlackCardRewardRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetGoldCardRewardRed() || RedDotDataManager.Instance.GetBlackCardRewardRed() || RedDotDataManager.Instance.GetBlackCardClothingRed());
             if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_MONTH_CARD)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_GOLD_CARD).asCom, RedDotDataManager.Instance.GetGoldCardRewardRed());
-                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_BLACK_CARD).asCom, RedDotDataManager.Instance.GetBlackCardRewardRed());
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_BLACK_CARD).asCom, RedDotDataManager.Instance.GetBlackCardRewardRed() || RedDotDataManager.Instance.GetBlackCardClothingRed());
             }
 
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn2.target, RedDotDataManager.Instance.GetGiftBagRewardRed());