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

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -24,6 +24,7 @@ namespace GFGGame
 
         public const string DRESS_FILTER = "DRESS_FILTER";
         public const string DRESS_SEARCH = "DRESS_SEARCH";
+        public const string DRESS_FILTER_RESET = "DRESS_FILTER_RESET";
         public const string CARD_CHOOSE = "CARD_CHOOSE";
         public const string CARD_SELECTED = "CARD_SELECTED";
         public const string SHOW_CARD_SKILL_END = "SHOW_CARD_SKILL_END";

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

@@ -477,22 +477,39 @@ namespace GFGGame
             if (suitCfg == null) return false;
             for (int i = 0; i < suitCfg.partsArr.Length; i++)
             {
-                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[i]);
-                if (ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum) continue;
+                if (CheckCanSynthetic(suitCfg.partsArr[i])) return true;
+            }
+            return false;
+        }
+        /// <summary>
+        /// 合成-服装部件红点
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <param name="showTips"></param>
+        /// <returns></returns>
+        public bool CheckCanSynthetic(int itemId)
+        {
+            //合成材料判断
+            if (ItemDataManager.GetItemNum(itemId) > 0) return false;
 
-                bool isEnough = true;
-                for (int j = 0; j < itemCfg.syntheticMateriarsArr.Length; j++)
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if (itemCfg == null || ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum)
+            {
+                return false;
+            }
+            List<ItemData> materiarsOfSelectedItem = ItemUtil.CreateItemDataList(itemCfg.syntheticMateriarsArr);
+            for (int i = 0; i < materiarsOfSelectedItem.Count; i++)
+            {
+                ItemData itemData = materiarsOfSelectedItem[i];
+                long numSynthetic = ItemDataManager.GetItemNum(itemData.id);
+                if (numSynthetic < itemData.num)
                 {
-                    if (ItemDataManager.GetItemNum(itemCfg.syntheticMateriarsArr[j][0]) < itemCfg.syntheticMateriarsArr[j][1])
-                    {
-                        isEnough = false;
-                        break;
-                    }
+                    return false;
                 }
-                if (isEnough) return true;
             }
-            return false;
+            return true;
         }
+
         /// <summary>
         /// 商城
         /// </summary>
@@ -768,16 +785,25 @@ namespace GFGGame
             for (int i = 0; i < DailySupplyCfgArray.Instance.dataArray.Length; i++)
             {
                 DailySupplyCfg supplyCfg = DailySupplyCfgArray.Instance.dataArray[i];
-                long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.openTime).ToString("HH:mm:ss"));
-                long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
+                if (DailySupplyRed(supplyCfg)) return true;
+            }
+            return false;
+        }
+        /// <summary>
+        /// 福利大厅-每日补给
+        /// </summary>
+        /// <returns></returns>
+        public bool DailySupplyRed(DailySupplyCfg supplyCfg)
+        {
+            long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.openTime).ToString("HH:mm:ss"));
+            long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
 
-                bool isGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.DailySupplyReward), supplyCfg.id);
+            bool isGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.DailySupplyReward), supplyCfg.id);
 
-                long curTime = TimeHelper.ServerNow();
-                if (!isGet && curTime > openTime && curTime < endTime)
-                {
-                    return true;
-                }
+            long curTime = TimeHelper.ServerNow();
+            if (!isGet && curTime > openTime && curTime < endTime)
+            {
+                return true;
             }
             return false;
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -159,20 +159,10 @@ namespace GFGGame
                 return;
             }
 
-            //合成材料判断
-            _materiarsOfSelectedItem = ItemUtil.CreateItemDataList(itemCfg.syntheticMateriarsArr);
-            int count = _materiarsOfSelectedItem.Count;
-            for (int i = 0; i < count; i++)
+            if (!RedDotDataManager.Instance.CheckCanSynthetic(_selectedItemId))
             {
-                ItemData itemData = _materiarsOfSelectedItem[i];
-                ItemCfg materialCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
-                bool isDressUp = materialCfg.itemType == ConstItemType.DRESS_UP;
-                long numSynthetic = ItemDataManager.GetItemNum(itemData.id);
-                if (numSynthetic < itemData.num)
-                {
-                    PromptController.Instance.ShowFloatTextPrompt("材料不足", MessageType.WARNING);
-                    return;
-                }
+                PromptController.Instance.ShowFloatTextPrompt("材料不足", MessageType.WARNING);
+                return;
             }
 
             bool result = await ClothingSyntheticSProxy.ClothtingSynthetic(_selectedItemId);
@@ -196,6 +186,8 @@ namespace GFGGame
             string itemName = itemCfg.name;
             listItem.m_txtName.text = itemName;
             listItem.m_imgOwned.visible = ItemDataManager.GetItemNum(itemId) > 0;
+
+            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.CheckCanSynthetic(itemId), "", -18, 20);
             UI_ClothingListItem.ProxyEnd();
         }
 
@@ -366,6 +358,7 @@ namespace GFGGame
             UI_ClothingListItem selectedItem = UI_ClothingListItem.Proxy(_selectedListItem);
             selectedItem.m_imgOwned.visible = ItemDataManager.GetItemNum(_selectedItemId) > 0;
             UI_ClothingListItem.ProxyEnd();
+            _ui.m_listClothing.numItems = _ui.m_listClothing.numItems;
             UpdateSelectedItemInfo();
         }
 
@@ -377,6 +370,8 @@ namespace GFGGame
             DressUpMenuSuitDataManager.GetSuitProgressBySuitId(_suitId, out count, out totalCount);
             _ui.m_txtProgress.text = string.Format("{0}/{1}", count, totalCount);
         }
+
+
         private void OnClickBtnHome()
         {
             GameController.GoBackToMainView();

GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyConfirmView.cs

@@ -60,6 +60,11 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("消耗不足");
                 return;
             }
+            if (RoleDataManager.ArenaFightTimes >= GlobalCfgArray.globalCfg.fightTimesLimit)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("已达到最大存储次数");
+                return;
+            }
             ArenaSproxy.ReqBuyArenaFightTimes().Coroutine();
         }
         private void OnClickBtnCancel()

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySupplyView.cs

@@ -74,6 +74,7 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateSupplyView);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
 
         protected override void OnShown()
@@ -83,6 +84,7 @@ namespace GFGGame
             _day = TimeUtil.GetCurDay();
             UpdateSupplyView();
             _ui.m_t0.Play();
+            UpdateRedDot();
         }
 
         protected override void OnHide()
@@ -95,6 +97,7 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateSupplyView);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
 
         private void OnBtnBackClick()
@@ -192,5 +195,10 @@ namespace GFGGame
                 UpdateSupplyView();
             }
         }
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_comSupply.m_comSupply0.m_btnGet, RedDotDataManager.Instance.DailySupplyRed(DailySupplyCfgArray.Instance.dataArray[0]));
+            RedDotController.Instance.SetComRedDot(_ui.m_comSupply.m_comSupply1.m_btnGet, RedDotDataManager.Instance.DailySupplyRed(DailySupplyCfgArray.Instance.dataArray[1]));
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -104,6 +104,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
             EventAgent.AddEventListener(ConstMessage.CARD_SELECTED, UpdateValueInfo);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         protected override void OnShown()
         {
@@ -171,7 +172,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
             EventAgent.RemoveEventListener(ConstMessage.CARD_SELECTED, UpdateValueInfo);
-
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         private void OnClickBtnBack()
         {
@@ -704,7 +705,13 @@ namespace GFGGame
                 });
         }
         /*****************************************************************************************************/
-
+        private void DressResetSerch()
+        {
+            if (currentListType == DressUpListType.List5)
+            {
+                OnTouchPad();
+            }
+        }
         private void UpdateSerch(EventContext context)
         {
             if (context.data.ToString() == ConstMessage.DRESS_SEARCH)

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressFilterView.cs

@@ -191,7 +191,7 @@ namespace GFGGame
             ResetFilter();
             ResetSearch();
             DressUpMenuItemDataManager.dressFilterType = DressFilterType.None;
-            EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER);
+            EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER_RESET);
         }
         private void ResetFilter()
         {

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -120,6 +120,7 @@ namespace GFGGame
 
             EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
             // EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
 
         }
@@ -225,6 +226,7 @@ namespace GFGGame
 
             EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
             // EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
 
         }
@@ -845,6 +847,13 @@ namespace GFGGame
                 });
         }
         /*****************************************************************************************************/
+        private void DressResetSerch()
+        {
+            if (currentListType == DressUpListType.List5)
+            {
+                OnTouchPad();
+            }
+        }
         private void UpdateSerch(EventContext context)
         {
             if (context.data.ToString() == ConstMessage.DRESS_SEARCH)

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -135,6 +135,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
             EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         protected override void OnShown()
         {
@@ -187,6 +188,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.CLOSE_PHOTOGRAPHVIEW, UpdateScene);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         private void OnClickBtnBack()
         {
@@ -680,6 +682,13 @@ namespace GFGGame
                 });
         }
         /****************************************************************************************************************************/
+        private void DressResetSerch()
+        {
+            if (currentListType == DressUpListType.List5)
+            {
+                OnTouchPad();
+            }
+        }
         private void UpdateSerch(EventContext context)
         {
             if (context.data.ToString() == ConstMessage.DRESS_SEARCH)

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -122,7 +122,7 @@ namespace GFGGame
                         rewardBox = _ui.m_LivenessProcess.m_Reward100;
                         break;
                 }
-                if(rewardBox != null)
+                if (rewardBox != null)
                 {
                     rewardBox.m_c1.selectedIndex = state;
                     RedDotController.Instance.SetComRedDot(rewardBox.target, state == 1);
@@ -135,8 +135,10 @@ namespace GFGGame
         {
             _cfgs = TaskDataManager.Instance.GetTaskCfgs(taskType);
             _ui.m_TaskList.numItems = _cfgs.Count;
-            RedDotController.Instance.SetComRedDot(_ui.m_btnDailyTask, TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily));
-            RedDotController.Instance.SetComRedDot(_ui.m_btnBattlePassTask, TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass));
+            RedDotController.Instance.SetComRedDot(_ui.m_btnDailyTask,
+                TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily));
+            RedDotController.Instance.SetComRedDot(_ui.m_btnBattlePassTask,
+                TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass));
         }
 
         private void TaskItemRender(int index, GObject obj)
@@ -182,6 +184,16 @@ namespace GFGGame
         private async void OnBtnGetClick(EventContext context)
         {
             if (!(context.sender is GObject btnGet)) return;
+            if (taskType == TaskType.BattlePass)
+            {
+                //检查通行证是否开启
+                var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+                if (!isBuy)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("开启锦罗织造可领取");
+                    return;
+                }
+            }
             var result = await TaskSProxy.GetTaskBonus((int)btnGet.data);
             if (!result) return;
             UpdateLivenessProcess();
@@ -206,6 +218,16 @@ namespace GFGGame
         private async void OnBtnGetAllClick()
         {
             //通用任务一键领奖
+            if (taskType == TaskType.BattlePass)
+            {
+                //检查通行证是否开启
+                var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+                if (!isBuy)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("开启锦罗织造可领取");
+                    return;
+                }
+            }
             var result = await TaskSProxy.GetAllTaskBonus(taskType);
             if (!result) return;
             UpdateLivenessProcess();