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

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

@@ -121,6 +121,7 @@ namespace GFGGame
         // public const string LEAGUE_ANSWER_STATE_CHANGE = "LEAGUE_ANSWER_STATE_CHANGE";//联盟答题状态更新
         public const string OTHER_ROLE_INFO_CHANGE = "OTHER_ROLE_INFO_CHANGE"; //其他玩家信息变化
         public const string NOTICE_CHAT_MESSAGE = "NOTICE_CHAT_MESSAGE"; //通知聊天信息
+        public const string OPEN_CHAT_MESSAGE = "OPEN_CHAT_MESSAGE"; //打开查看聊天信息
         public const string ACTIVE_SKILL = "ACTIVE_SKILL";//技能激活
 
         public const string CONTINUOUS_REBATE_GIFT = "CONTINUOUS_REBATE_GIFT"; //领取连续返利礼包

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

@@ -14,34 +14,14 @@ namespace Assets.Game.HotUpdate.Data
         /**********************************************************新春活动*************************************************/
         public List<NpcVisitProto> NpcInfoList = new List<NpcVisitProto>();
 
-        public bool CheckOpen()
-        {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.TEA);
-            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
-                   activityInfo.EndTime > TimeHelper.ServerNow();
-        }
-
-        public bool CheckOpenOne(int id)
-        {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
-            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
-                   activityInfo.EndTime > TimeHelper.ServerNow();
-        }
-
-        public long GetEndTime(int id)
-        {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
-            return activityInfo.EndTime;
-        }
-
         public bool GetRewardRed()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.NewYearVisit))
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearVisit) == 0)
             {
                 return false;
             }
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
-           int time = limitData.TotalPlayMax - limitData.PlayTimes;
+            int time = limitData.TotalPlayMax - limitData.PlayTimes;
 
             foreach (NpcVisitProto t in NpcInfoList)
             {
@@ -55,10 +35,14 @@ namespace Assets.Game.HotUpdate.Data
         //获取华容道可用次数
         public bool CheckHRDRed()
         {
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) == 0)
+            {
+                return false;
+            }
             RoleLimitData limitData;
             limitData = RoleLimitDataManager.GetLimitData(300);
             int times = limitData.TotalPlayMax - limitData.PlayTimes;
-            if(times > 0 && ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.AfternoonLeisure))
+            if(times > 0)
             {
                 return true;
             }
@@ -67,5 +51,25 @@ namespace Assets.Game.HotUpdate.Data
                 return false;
             }
         }
+
+        //合成红点
+        public bool GetActivitySyntheticRed()
+        {
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.ItemSynthetic) == 0)
+            {
+                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/Data/ChatDataManager.cs

@@ -9,6 +9,7 @@ namespace GFGGame
     {
         public Dictionary<int, List<ChatData>> ChatDatas = new Dictionary<int, List<ChatData>>();//int:ChatType
         public Dictionary<long, List<ChatData>> PrivateChatDatas = new Dictionary<long, List<ChatData>>();//int:RoleId
+        public bool NewChatInfo = false;  //ÓÐеÄÑż¯ÁÄÌìÐÅÏ¢
 
         public void Clear()
         {

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

@@ -17,7 +17,7 @@ namespace GFGGame
     {
         public static async ETTask<bool> ReqGetNPCVisitInfo(int id = 5004)
         {
-            if(!ActivityTeaDataManager.Instance.CheckOpen())
+            if(ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.TEA) == 0)
             {
                 return false;
             }

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

@@ -22,6 +22,9 @@ namespace ET
             {
                 ChatDataManager.Instance.GetChatDatas(chatData.Type).Add(chatData);
             }
+            if (!ViewManager.isViewOpen(typeof(LeagueChatView).FullName)) 
+                ChatDataManager.Instance.NewChatInfo = true;
+
             EventAgent.DispatchEvent(ConstMessage.NOTICE_CHAT_MESSAGE);
             await ETTask.CompletedTask;
         }

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()
@@ -75,7 +76,7 @@ namespace GFGGame
 
         private void OnClickBtnHuaRongDaoView()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.AfternoonLeisure))
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;
@@ -87,7 +88,7 @@ namespace GFGGame
 
         private async void OnClickBtnVisitView()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.NewYearVisit))
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearVisit) == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;
@@ -102,14 +103,14 @@ namespace GFGGame
 
         private void OnClickBtnMergeView()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.ItemSynthetic))
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.ItemSynthetic) == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;
             }
 
-                //合成入口
-                ViewManager.Show<ActivitySyntheticView>();
+            //合成入口
+            ViewManager.Show<ActivitySyntheticView>();
         }
 
     }

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

@@ -101,8 +101,12 @@ namespace GFGGame
             _ui.m_time.text = "剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
         }
 
-        private void UpdateVisitNum()
+        private void UpdateVisitNum(EventContext context = null)
         {
+            if ((int)context.data != ActivityVisitCfgArray.Instance.dataArray[0].limitId)
+            {
+                return;
+            }
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
             time = limitData.TotalPlayMax - limitData.PlayTimes;
             _ui.m_visitNum.text = "当前拜访次数：" + time + "/" + limitData.TotalPlayMax;

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

@@ -64,10 +64,14 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) == 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                ViewManager.GoBackFrom(typeof(ActivityVisitNpcView).FullName);
+                return;
+            }
             EventAgent.AddEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTasksChange);
-
             npcId = (int)this.viewData;
-
             var taskCfgs = TaskDataManager.Instance.GetTaskCfgs(ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr);
             _ui.m_taskList.data = taskCfgs;
             _ui.m_npcIcon.url = ResPathUtil.GetNpcPicSPath(ActivityVisitCfgArray.Instance.dataArray[npcId].picRes);

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

@@ -49,6 +49,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _ui.m_mask.touchable = false;
             if ((this.viewData as object[]).Length > 0)
             {
                 _listItemDatas = (this.viewData as object[])[0] as List<ItemData>;
@@ -79,6 +80,12 @@ namespace GFGGame
             _ui.m_comList.m_listReward.numItems = 0;
             counTime = 0;
             Timers.inst.Add(0.1f, 3, OnTimerUpdate, 1);
+            Timers.inst.Add(0.5f, 1, OnTimerClick);
+        }
+
+        private void OnTimerClick(object param)
+        { 
+            _ui.m_mask.touchable = true;
         }
 
         private void OnTimerUpdate(object param)
@@ -114,7 +121,8 @@ namespace GFGGame
             _effectUI2 = null;
             
             Timers.inst.Remove(OnTimerUpdate);
-
+            Timers.inst.Remove(OnTimerClick);
+            _ui.m_mask.touchable = true;
             for (int i = 0; i < _effects.Count; i++)
             {
                 if (_effects[i] != null)

GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnswerRankView.cs

@@ -84,7 +84,7 @@ namespace GFGGame
         }
         private void UpdateView()
         {
-            if (!LeagueDataManager.Instance.ListAnswerRankDatas.ContainsKey(_ui.m_c1.selectedIndex))
+            if (LeagueDataManager.Instance.ListAnswerRankDatas.ContainsKey(_ui.m_c1.selectedIndex))
                 _ui.m_list.numItems = LeagueDataManager.Instance.ListAnswerRankDatas[_ui.m_c1.selectedIndex].Count;
             UpdateItem(_myIndex, _ui.m_comMine.target, true);
         }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueChatView.cs

@@ -44,6 +44,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            ChatDataManager.Instance.NewChatInfo = false;
+            EventAgent.DispatchEvent(ConstMessage.OPEN_CHAT_MESSAGE);
             UpdateChatList();
         }
 

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -82,7 +82,10 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.LEAGUE_INFO_CHANGE, UpdateView);
             EventAgent.AddEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+            EventAgent.AddEventListener(ConstMessage.NOTICE_CHAT_MESSAGE, UpdateRedChatBtn);
+            EventAgent.AddEventListener(ConstMessage.OPEN_CHAT_MESSAGE, UpdateRedChatBtn);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -108,6 +111,8 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.LEAGUE_INFO_CHANGE, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_CHAT_MESSAGE, UpdateRedChatBtn);
+            EventAgent.RemoveEventListener(ConstMessage.OPEN_CHAT_MESSAGE, UpdateRedChatBtn);
         }
 
         private void OnBtnBackClick()
@@ -250,6 +255,11 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnParty.target, RedDotDataManager.Instance.GetLeagueTeaPartyRed(), "", -440, 60);
         }
 
+        private void UpdateRedChatBtn()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnChat, ChatDataManager.Instance.NewChatInfo, "", 10, -10);
+        }
+
         private void UpdateEffect()
         {
             _ui.m_btnPray.m_effect.scale = new Vector2(0.8f, 0.8f);

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

@@ -649,8 +649,8 @@ namespace GFGGame
 
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
             _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
-            _ui.m_btnTea.target.visible = ActivityTeaDataManager.Instance.CheckOpen();
-            _ui.m_btnActivityZCJB.target.visible = ActivityTeaDataManager.Instance.CheckOpenOne(17);
+            _ui.m_btnTea.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(12) == 0 ? false : true;
+            _ui.m_btnActivityZCJB.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(17) == 0 ? false: true;
         }
 
         private void UpdateTime()
@@ -947,7 +947,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)
@@ -1108,24 +1108,24 @@ namespace GFGGame
                     return;
                 }
             }
-            //月卡弹窗
-            if (GameGlobal.AutoMonthlyCardView)
-            {
-                GameGlobal.AutoMonthlyCardView = false;
-                if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity) == 0)
-                {
-                    long endTime1 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
-                    long endTime2 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime);
-                    if (endTime1 < TimeHelper.ServerNow())
-                    {
-                        if (endTime2 < TimeHelper.ServerNow())
-                        {
-                            ViewManager.Show<MonthlyCardTipsView>();
-                            return;
-                        }
-                    } 
-                }
-            }
+            //月卡弹窗 暂时屏蔽该两个弹窗
+            //if (GameGlobal.AutoMonthlyCardView)
+            //{
+            //    GameGlobal.AutoMonthlyCardView = false;
+            //    if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity) == 0)
+            //    {
+            //        long endTime1 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
+            //        long endTime2 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime);
+            //        if (endTime1 < TimeHelper.ServerNow())
+            //        {
+            //            if (endTime2 < TimeHelper.ServerNow())
+            //            {
+            //                ViewManager.Show<MonthlyCardTipsView>();
+            //                return;
+            //            }
+            //        } 
+            //    }
+            //}
             //活动公告弹窗
             if (GameGlobal.AutoAcitivtyTipsLoginView)
             {
@@ -1136,22 +1136,22 @@ namespace GFGGame
                     return;
                 }
             }
-            if (GameGlobal.AutoSpecialOfferGiftBoxView)
-            {
-                //List<int> shopListId = new List<int>() { 40012, 40013 };
-                //if (ShopDataManager.Instance.GetShopIdCanBuyInShop(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY, shopListId))
-                //{
-                //    ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
-                //    return;
-                //}
-
-                if (LimitedTimeGiftBoxDataManager.Instance.SpecialOfferGiftBoxCanBuy())
-                {
-                    ViewManager.Show<SpecialOfferGiftBoxView>();
-                    return;
-                }
+            //if (GameGlobal.AutoSpecialOfferGiftBoxView)
+            //{
+            //    //List<int> shopListId = new List<int>() { 40012, 40013 };
+            //    //if (ShopDataManager.Instance.GetShopIdCanBuyInShop(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY, shopListId))
+            //    //{
+            //    //    ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+            //    //    return;
+            //    //}
+
+            //    if (LimitedTimeGiftBoxDataManager.Instance.SpecialOfferGiftBoxCanBuy())
+            //    {
+            //        ViewManager.Show<SpecialOfferGiftBoxView>();
+            //        return;
+            //    }
 
-            }
+            //}
             if (FieldDataManager.Instance.waitToShowFieldFightEndView)
             {
                 ViewManager.Show<FieldFightEndView>();