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

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/ActivityHuaRongDao/ActivityHuaRongDaoEntryView.cs

@@ -54,8 +54,14 @@ namespace GFGGame
             _ui.m_hide.Play();
             _activityID = (int)viewData;
             await InitInfo();
+
+            if (!isShowing)
+            {
+                return;
+            }
             _ui.m_show.Play();
             UpdateTime(null);
+            Timers.inst.Remove(UpdateTime);
             Timers.inst.Add(1, 0, UpdateTime);
         }
 

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

@@ -100,7 +100,7 @@ namespace GFGGame
             _ui.m_teaPartyItemTips.target.visible = false;
             int myPos = LeagueDataManager.Instance.GetMyPos();
             bool isLeader = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
-            _ui.m_btnChallenge.visible = isLeader;
+            _ui.m_btnChallenge.visible = false;
             _ui.m_btnChallenge.grayed = LeagueDataManager.Instance.TeaPartyStatus != LeagueTeaPartyStatus.YesOpen;
 
             GetTeapartyMatchingInfos();

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

@@ -109,6 +109,8 @@ namespace GFGGame
             _ui.m_btnWanShiLi.target.onClick.Add(OnClickBtnWanShiLi);
             _ui.m_btnTea.target.onClick.Add(OnClickBtnTea);
             _ui.m_btnActivityZCJB.target.onClick.Add(OnClickBtnZCJB);
+            //_ui.m_btnGetYuanXiao.target.onClick.Add(OnClickBtnGetYuanXiao);
+            //_ui.m_btnGetYuanXiao.target.visible = false;
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
@@ -1106,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)
             {
@@ -1134,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>();
@@ -1185,5 +1187,10 @@ namespace GFGGame
         {
             _ui.m_show.Play();
         }
+
+        //private void OnClickBtnGetYuanXiao()
+        //{
+        //    ViewManager.Show<ActivityGetYuanXiaoView>();
+        //}
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -216,6 +216,11 @@ namespace GFGGame
             if (PoemGalleryDataManager.Instance.HasBonus)
             {
                 bool result = await PoemGallerySProxy.ReqGetGalleryRankBonus();
+                if (!isShowing)
+                {
+                    return;
+                }
+
                 if (result && PoemGalleryDataManager.Instance.MyWorksRanks.Count > 0)
                 {
                     ViewManager.Show<PoemGalleryRewardGetView>();

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs

@@ -51,6 +51,10 @@ namespace GFGGame
 
             _ui.m_Hide.Play();
             _roleDetailInfo = await RoleInfoSProxy.ReqOtherRoleDetailInfo(_roleInfo.roleId);
+            if (!isShowing)
+            {
+                return;
+            }
             _ui.m_Show.Play();
             _roleInfo = _roleDetailInfo.roleInfo;
             if (_roleDetailInfo != null)