Merge remote-tracking branch 'remotes/origin/master' into xiaojie

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/ActivityDay7DataManager.cs

@@ -8,7 +8,7 @@ namespace GFGGame
         {
             //获取7日任务活动
             var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.Day7);
-            return activityInfo == null ? 0 : TimeUtil.GetDay5(activityInfo.StartTime, TimeHelper.ServerNow());
+            return activityInfo == null ? 0 : TimeUtil.GetDay5(activityInfo.StartTime);
         }
 
         public long GetScore()

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

@@ -232,7 +232,7 @@ namespace GFGGame
         public static bool CheckSuitHasActionRes(int suitId)
         {
             var suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
-            return suitCfg != null && ResPathUtil.CheckDressUpAnimationExist(suitCfg.aniRes);
+            return suitCfg != null && ResPathUtil.CheckDressUpAnimationResExist(suitCfg.aniRes);
         }
 
     }

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>
@@ -429,6 +442,7 @@ namespace GFGGame
         {
             if (ActivityDataManager.Instance.actLimitChargeId == 0) return false;
             ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
+            if (_activityInfo == null) return false;
             List<ActivityRechargeCfg> _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(ActivityDataManager.Instance.actLimitChargeId);
             for (int i = 0; i < _rechargeCfgs.Count; i++)
             {
@@ -456,6 +470,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/Data/TaskDataManager.cs

@@ -229,6 +229,9 @@ namespace GFGGame
                     ViewManager.Show(goBackDatas[0].ToString(), goBackDatas.Length > 1 ? goBackDatas[1] : null);
                     ViewManager.Show<StoreView>(param, goBackDatas);
                     break;
+                case nameof(StoryChapterListView):
+                    ViewManager.Show($"GFGGame.{jumpId}", param, goBackDatas, true, true);
+                    break;
                 default:
                     ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, true, true);
                     break;

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -238,7 +238,6 @@ namespace GFGGame
             if (checkDefault)
             {
                 checkDefaultItem();
-                UpdateWholeBodyView();
             }
             RoleLevelCfg roleLevelCfg = RoleLevelCfgArray.Instance.GetCfg(GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl));
             // FightDataManager.Instance.score = roleLevelCfg.baseScore;
@@ -326,7 +325,6 @@ namespace GFGGame
                 }
             }
             checkDefaultItem();
-            UpdateWholeBodyView();
         }
 
         //穿上一个动作
@@ -350,7 +348,6 @@ namespace GFGGame
                 CancelAction(true);
             }
             checkDefaultItem();
-            UpdateWholeBodyView();
         }
 
         //取消动作
@@ -400,7 +397,6 @@ namespace GFGGame
                 AddOrRemove(itemID, false, true);
             }
             checkDefaultItem();
-            UpdateWholeBodyView();
 
         }
 
@@ -419,7 +415,6 @@ namespace GFGGame
                 AddOrRemove(itemID, false, true);
             }
             checkDefaultItem();
-            UpdateWholeBodyView();
         }
 
         public int GetItemIdBuyType(int subType)
@@ -516,6 +511,8 @@ namespace GFGGame
             bool hasNeiDaDefault = false;
             //是否有默认下装
             bool hasXiaZhuangDefault = false;
+            //是否有妆容
+            bool hasZhuangRong = false;
             for (int i = 0; i < _dressUpData.itemList.Count; i++)
             {
                 int itemID = (int)_dressUpData.itemList[i];
@@ -540,6 +537,11 @@ namespace GFGGame
                 {
                     hasShangYi = true;
                 }
+                else if (subType == ConstDressUpItemType.ZHUANG_RONG)
+                {
+                    hasZhuangRong = true;
+                }
+
                 if (itemID == ConstItemID.DEFULT_NEI_DA)
                 {
                     hasNeiDaDefault = true;
@@ -577,23 +579,24 @@ namespace GFGGame
 
                 }
             }
-
             CheckCurDressIsSuit();
+            DressUpUtil.UpdateHead(!hasZhuangRong, _sceneObj, _needSetMask, _roleObj);
+            UpdateBodyView();
         }
 
-        //更新整个身体层（包括头和躯干）
-        private void UpdateWholeBodyView()
+        //更新整个身体
+        private void UpdateBodyView()
         {
             if (IsAction)
             {
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.actionId);
-                var hasAniRes = ResPathUtil.CheckDressUpAnimationExist(suitCfg.aniRes);
-                var res = hasAniRes ? suitCfg.aniRes : null;
-                DressUpUtil.UpdateWholeBody(res, _sceneObj, hasAniRes, res, false, _roleObj);
+                var hasAniRes = ResPathUtil.CheckDressUpAnimationResExist(suitCfg.aniRes);
+                var actionRes = hasAniRes ? suitCfg.aniRes : null;
+                DressUpUtil.UpdateBody(actionRes, _sceneObj, _needSetMask, _roleObj);
             }
             else
             {
-                DressUpUtil.UpdateWholeBody(null, _sceneObj, false, null, _needSetMask, _roleObj);
+                DressUpUtil.UpdateBody(null, _sceneObj, _needSetMask, _roleObj);
             }
         }
 

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -137,57 +137,73 @@ namespace GFGGame
             }
         }
 
-        public static void InitHead(GameObject sceneObj, bool needSetMask = false, GameObject parentObj = null)
+        public static void UpdateHead(bool show, GameObject sceneObj, bool needSetMask = false, GameObject parentObj = null)
         {
             var roleTf = sceneObj.transform.Find(ROLE_OBJ_NAME);
             parentObj = parentObj == null ? roleTf.gameObject : parentObj;
             string res = HEAD_DEFAULT_RES_NAME;
+
             Transform transform_t = parentObj.transform.Find(HEAD_SPRITE_NAME);
-            if (transform_t != null)
+            if (show)
             {
-                return;
+                if (transform_t != null)
+                {
+                    transform_t.gameObject.SetActive(true);
+                    return;
+                }
+                AddSpriteObj(res, "png", HEAD_SPRITE_NAME, parentObj, 1, needSetMask);
+            }
+            else
+            {
+                if(transform_t == null)
+                {
+                    return;
+                }
+                transform_t.gameObject.SetActive(false);
             }
-            AddSpriteObj(res, "png", HEAD_SPRITE_NAME, parentObj, 1, needSetMask);
-        }
-
-        public static void UpdateWholeBody(string res, GameObject sceneObj, bool isAni = false, string effRes = null, bool needSetMask = false, GameObject parentObj = null)
-        {
-            InitHead(sceneObj, needSetMask, parentObj);
-            UpdateBodyOnly(res, sceneObj, isAni, effRes, needSetMask, parentObj);
         }
 
-        public static void UpdateBodyOnly(string res, GameObject sceneObj, bool isAni = false, string effRes = null, bool needSetMask = false, GameObject parentObj = null)
+        public static void UpdateBody(string actionRes, GameObject sceneObj, bool needSetMask = false, GameObject parentObj = null)
         {
             //角色
             var roleTf = sceneObj.transform.Find(ROLE_OBJ_NAME);
             parentObj = parentObj == null ? roleTf.gameObject : parentObj;
-            if (res == null)
+
+            var extPng = "png";
+            if (!string.IsNullOrEmpty(actionRes))
+            {
+                string resPath = ResPathUtil.GetDressUpAnimationPath(actionRes);
+                if (CheckGameObjExisted(parentObj, BODY_ANIMATION_NAME, resPath))
+                {
+                    return;
+                }
+            }
+            else
             {
-                res = BODY_DEFAULT_RES_NAME;
+                string resPath = ResPathUtil.GetDressUpPath(BODY_DEFAULT_RES_NAME, extPng);
+                if (CheckGameObjExisted(parentObj, BODY_SPRITE_NAME, resPath))
+                {
+                    return;
+                }
             }
 
-            //清理旧的
-            TryRemoveObj(parentObj, BODY_SPRITE_NAME);
             var removeBodyAni = TryRemoveObj(parentObj, BODY_ANIMATION_NAME);
             TryRemoveObj(parentObj, BODY_EFFECT_OBJ_NAME);
-
-            if (isAni)
+            TryRemoveObj(parentObj, BODY_SPRITE_NAME);
+            if (!string.IsNullOrEmpty(actionRes))
             {
-                AddAnimationObj(res, BODY_ANIMATION_NAME, parentObj, 0);
+                AddAnimationObj(actionRes, BODY_ANIMATION_NAME, parentObj, 0);
+                //特效
+                TryAddEffectObj(actionRes, BODY_EFFECT_OBJ_NAME, parentObj, 0, false);
             }
             else
             {
-                AddSpriteObj(res, "png", BODY_SPRITE_NAME, parentObj, 0, needSetMask);
+                AddSpriteObj(BODY_DEFAULT_RES_NAME, extPng, BODY_SPRITE_NAME, parentObj, 0, needSetMask);
                 if (removeBodyAni)
                 {
                     parentObj.transform.SetPositionAndRotation(new Vector3(), new Quaternion());
                 }
             }
-            //特效
-            if (!string.IsNullOrEmpty(effRes))
-            {
-                TryAddEffectObj(effRes, BODY_EFFECT_OBJ_NAME, parentObj, 0, false);
-            }
         }
 
         public static void AddAssetReleaser(GameObject gameObj, string resPath)
@@ -243,17 +259,17 @@ namespace GFGGame
             //清理旧的
             var spritObjName = string.Format(FORMAT_SPRITE_NAME, itemCfg.subType, layerId);
             TryRemoveObj(parentObj, spritObjName);
-            var aniObjName = string.Format(FORMAT_ANIMATION_NAME, itemCfg.subType, layerId);
-            TryRemoveObj(parentObj, aniObjName);
+            var objName = string.Format(FORMAT_ANIMATION_NAME, itemCfg.subType, layerId);
+            TryRemoveObj(parentObj, objName);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
             //这里需要先添加静态图，防止加载动画有延迟，出现光头
             GameObject spriteObj = AddSpriteObj(res, ext, spritObjName, parentObj, sortingOrder, needSetMask);
 
-            GameObject aniObj = null;
+            GameObject addAniObj = null;
             if (showAni)
             {
-                aniObj = AddAnimationObj(res, aniObjName, parentObj, sortingOrder);
-                if (aniObj != null && spriteObj != null)
+                addAniObj = AddAnimationObj(res, objName, parentObj, sortingOrder);
+                if (addAniObj != null && spriteObj != null)
                 {
                     Timers.inst.Add(0.03f, 1, (obj) =>
                     {
@@ -280,9 +296,9 @@ namespace GFGGame
                 }
             }
 
-            aniObjName = string.Format(FORMAT_EFFECT_OBJ_NAME, itemCfg.subType, layerId);
-            TryRemoveObj(parentObj, aniObjName);
-            TryAddEffectObj(res, aniObjName, parentObj, sortingOrder, aniObj != null);
+            objName = string.Format(FORMAT_EFFECT_OBJ_NAME, itemCfg.subType, layerId);
+            TryRemoveObj(parentObj, objName);
+            TryAddEffectObj(res, objName, parentObj, sortingOrder, addAniObj != null);
         }
 
         private static GameObject AddSpriteObj(string res, string ext, string objName, GameObject parentObj, int sortingOrder, bool needSetMask)
@@ -292,6 +308,10 @@ namespace GFGGame
             {
                 return null;
             }
+            if (CheckGameObjExisted(parentObj, objName, resPath))
+            {
+                return null;
+            }
             SpriteRenderer spr = null;
             var gameObj = parentObj.transform.Find(objName)?.gameObject;
             if (gameObj == null)
@@ -370,6 +390,30 @@ namespace GFGGame
             return gameObj;
         }
 
+        private static void TryAddEffectObj(string res, string objName, GameObject parentObj, int sortingOrder, bool inAniDir)
+        {
+            var resPath = ResPathUtil.GetDressUpEffectPath(res, inAniDir);
+            if (!VEngine.Versions.Contains(resPath))
+            {
+                return;
+            }
+            if (CheckGameObjExisted(parentObj, objName, resPath))
+            {
+                return;
+            }
+            GameObject effPre = GFGAsset.Load<GameObject>(resPath);
+            var gameObj = GameObject.Instantiate(effPre);
+            AddAssetReleaser(gameObj, resPath);
+            gameObj.transform.SetParent(parentObj.transform, false);
+            gameObj.name = objName;
+            var sortingGroup = gameObj.transform.GetComponent<SortingGroup>();
+            if (sortingGroup != null)
+            {
+                GameObject.Destroy(sortingGroup);
+            }
+            SetRenderersOrder(gameObj, sortingOrder + 1);//特效层默认高一个层级
+        }
+
         private static bool TryRemoveObj(GameObject parentObj, string objName)
         {
             if (parentObj == null)
@@ -428,26 +472,6 @@ namespace GFGGame
             return gameObj;
         }
 
-        private static void TryAddEffectObj(string res, string objName, GameObject parentObj, int sortingOrder, bool inAni)
-        {
-            var resPath = ResPathUtil.GetDressUpEffectPath(res, inAni);
-            if (!VEngine.Versions.Contains(resPath))
-            {
-                return;
-            }
-            GameObject effPre = GFGAsset.Load<GameObject>(resPath);
-            var gameObj = GameObject.Instantiate(effPre);
-            AddAssetReleaser(gameObj, resPath);
-            gameObj.transform.SetParent(parentObj.transform, false);
-            gameObj.name = objName;
-            var sortingGroup = gameObj.transform.GetComponent<SortingGroup>();
-            if (sortingGroup != null)
-            {
-                GameObject.Destroy(sortingGroup);
-            }
-            SetRenderersOrder(gameObj, sortingOrder + 1);//特效层默认高一个层级
-        }
-
         public static void LoadSpritePos(string res, out float tx, out float ty)
         {
             string resPath = ResPathUtil.GetDressUpPath(res, "bytes");

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -16,7 +16,7 @@ namespace GFGGame
             DressUpUtil.AddAssetReleaser(tf.gameObject, resPath);
             spr.sprite = sp;
             //角色
-            DressUpUtil.UpdateBodyOnly("ui_loginrole", sceneObj, true);
+            DressUpUtil.UpdateBody("ui_loginrole", sceneObj);
         }
 
         public static void UpdateMainScene(GameObject sceneObj)

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -116,7 +116,7 @@ namespace GFGGame
             return $"{GetDressUpAnimationDirPath(res)}/{res}.{extName}";
         }
 
-        public static bool CheckDressUpAnimationExist(string res, string extName = "prefab")
+        public static bool CheckDressUpAnimationResExist(string res, string extName = "prefab")
         {
             if(string.IsNullOrEmpty(res))
             {
@@ -135,9 +135,9 @@ namespace GFGGame
             return $"{EFFECT_DIR_PATH}/DressUp/{res}";
         }
 
-        public static string GetDressUpEffectPath(string res, bool inAni = false, string extName = "prefab")
+        public static string GetDressUpEffectPath(string res, bool inAniDir = false, string extName = "prefab")
         {
-            return $"{GetDressUpEffectDirPath(res, inAni)}/{res}.{extName}";
+            return $"{GetDressUpEffectDirPath(res, inAniDir)}/{res}.{extName}";
         }
         public static string GetViewEffectPath(string uiName, string resName, string extName = "prefab")
         {

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/MainStory/StoryChapterListView.cs

@@ -51,7 +51,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fuben_bjbj");
 
             subType = 0;//MainStoryDataManager.GetChapterSubType(MainStoryDataManager.currentChapterCfgId);
-            if (this.viewData != null)
+            if (this.viewData != null && (this.viewData as object[]).Length > 0)
             {
                 subType = (int)(this.viewData as object[])[0];
             }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -225,7 +225,7 @@ namespace GFGGame
 
 
             RoleInfoManager.Instance.UpdateHead(_ui.m_myHead, roleData.headId, 0);
-            _ui.m_proScore.m_txtMineScore.text = RoleDataManager.roleName + " 0";
+            _ui.m_proScore.m_txtMineScore.text = " 0";
             _mainScore = ScoreSystemData.Instance.GetMainScore(roleData);
             _roundTimes = ScoreSystemData.Instance.GetRoundTime(roleData.cardId, roleData.skillLvs);
 
@@ -527,8 +527,8 @@ namespace GFGGame
 
         private void UpdateProgress(Action onFinish)
         {
-            _ui.m_proScore.m_txtMineScore.text = RoleDataManager.roleName + " " + _score;
-            _ui.m_proScore.m_txtNpcScore.text = targetData.name + " " + _targetScore;
+            _ui.m_proScore.m_txtMineScore.text = " " + _score;
+            _ui.m_proScore.m_txtNpcScore.text = " " + _targetScore;
 
             double proportion = _score + _targetScore == 0 ? 0 : _score / (_score + _targetScore);
             float width = (float)(proportion * _ui.m_proScore.target.width);

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());