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

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

@@ -224,6 +224,7 @@ namespace GFGGame
             await ActivitySProxy.ReqGetNewPlayerBonusStatus();
             await ActivitySProxy.GetNewPlayerOnceStatus();
             await ActivitySProxy.GetTipsStatus();
+            await ActivitySProxy.GetOnceStatus(5006);
 
             FieldDataManager.Instance.waitToShowFieldFightEndView = false;
             bool result = await FieldSProxy.ReqFieldInstanceInfos();
@@ -314,6 +315,7 @@ namespace GFGGame
             GameGlobal.AutoZGTHDCTips = true;
             GameGlobal.AutoZGTHTips = true;
             GameGlobal.AutoPearRebateTips = true;
+            GameGlobal.AutoZCJBTips = true;
             GameGlobal.AutoShowCompleted = false;
             GameGlobal.PreDataInited = false;
             GameGlobal.AfterDataInited = false;

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

@@ -284,7 +284,7 @@ namespace GFGGame
         {
             ItemData numItem;
             long num;
-            if(BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            if(BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -388,5 +388,20 @@ namespace GFGGame
             long curTime = (endTime - laterTime)* 1000;
             return curTime;
         }
+        public bool isExtendTime(int day)
+        {
+            ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
+            long endTime = TimeUtil.DateTimeToTimestamp(activityCfg.endTime);
+            long ExtendTime = (day * 24 * 60 * 60 * 1000);
+            long currentTime = TimeHelper.ServerNow();
+            if(currentTime > endTime)
+            {
+                if((currentTime - endTime) <= ExtendTime)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

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

@@ -653,10 +653,15 @@ namespace GFGGame
         /// <param name="itemId"></param>
         /// <param name="showTips"></param>
         /// <returns></returns>
+        public int count = 0;
         public bool CheckCardCanSynthetic(int itemId)
         {
-            //合成材料判断
+            GetCardTimers(itemId).Coroutine();
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if(count >= itemCfg.syntheticTimes)
+            {
+                return false;
+            }
             if (itemCfg == null || ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum || itemCfg.syntheticTimes <= 0)
             {
                 return false;
@@ -673,6 +678,13 @@ namespace GFGGame
             }
             return true;
         }
+        public async ETTask<bool> GetCardTimers(int itemId)
+        {
+            //合成材料判断
+            var response = await ClothingSyntheticSProxy.GetCardSyntheticCount(itemId);
+            count = response;
+            return true;
+        }
         /// <summary>
         /// 商城
         /// </summary>

GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -44,6 +44,7 @@ namespace GFGGame
         public static bool AutoZGTHDCTips = true;
         public static bool AutoZGTHTips = true;
         public static bool AutoPearRebateTips = true;
+        public static bool AutoZCJBTips = true;
         //用于标记自动检测打开界面流程已执行完毕
         public static bool AutoShowCompleted;
 

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

@@ -274,6 +274,32 @@ namespace GFGGame
             }
             return false;
         }
+        public static async ETTask SetOnceStatus(int k,long id,int type)
+        {
+            S2C_UpdateDataRecord response = (S2C_UpdateDataRecord)await MessageHelper.SendToServer(new C2S_UpdateDataRecord() { K = k, V = id ,ResetType = type });
+        }
+        public static async ETTask<bool> GetOnceStatus(long k)
+        {
+            S2C_GetDataRecord response = (S2C_GetDataRecord)await MessageHelper.SendToServer(new C2S_GetDataRecord() { });
+            for (int i = 0; i < response.AllKs.Count; i++)
+            {
+                if (response.AllKs[i] == k)
+                {
+                    if (response.AllVs[i] == 1)
+                    {
+                        GameGlobal.AutoZCJBTips = false;
+                        return true;
+                    }
+                    else
+                    {
+                        GameGlobal.AutoZCJBTips = true;
+                        return true;
+                    }
+                }
+            }
+            GameGlobal.AutoZCJBTips = true;
+            return true;
+        }
         /**********************************************************新年签到*************************************************/
        
         public static async ETTask<bool> ReqGetActivitySignInfos()

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs

@@ -80,7 +80,7 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
 
             //_comEff = new GComponent();
             //_comEff = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComEff").asCom;
@@ -138,7 +138,7 @@ namespace GFGGame
             UI_ComponentValueBar valueBar = UI_ComponentValueBar.Proxy(_ui.m_valueBar);
             valueBar.m_c1.selectedIndex = 12;
             UI_ComponentValueBar.ProxyEnd();
-            _valueBarController.UpdateList(new List<int>() { 3000023, ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
+            _valueBarController.UpdateList(new List<int>() { ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
             _ui.m_selectChapter.visible = false;
             _ui.m_switchChapter.target.visible = false;
             _ui.m_bonusBox.visible = false;
@@ -200,12 +200,12 @@ namespace GFGGame
             currentDifficulty = chapterCfg.type;
             if (currentDifficulty == 1)
             {
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
             }
             else
             {
                 currentDifficulty = 0;
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
             }
             //_comEff.visible = false;
             //_effFirst.visible = false;
@@ -229,7 +229,7 @@ namespace GFGGame
                     levelItem.target.visible = true;
                     levelItem.target.onClick.Clear();
                     levelItem.target.onClick.Add(OnListItemClick);
-                    string showId = "0-"+ (i+1);
+                    string showId = "1-"+ (i+1);
                     levelItem.m_txtFightOrder.text = showId;
                     if (levelCfg.fightID.Length > 0)
                     {

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs

@@ -51,7 +51,7 @@ namespace GFGGame
             ItemCfg costItem = ItemCfgArray.Instance.GetCfg(ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][0]);
             ItemData numItem;
             long num;
-            if (BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            if (BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -99,14 +99,14 @@ namespace GFGGame
             item.m_List.numItems = ActivityDressCfgArray.Instance.dataArray[index].bonusArr.Length;
 
             //最后一档特殊处理
-            if(index == ActivityDressCfgArray.Instance.dataArray.Length - 1)
-            {
-                item.m_rewardNum.visible = true;
-                int numChange = GameGlobal.myNumericComponent.GetAsInt(NumericType.ActivityDressLastGearRewrdNum);
-                item.m_rewardNum.text = string.Format("已兑换次数：{0}/{1}", numChange, 50);
-                RedDotController.Instance.SetComRedDot(item.m_RewardBtn.target, false);
-            }
-            else
+            //if(index == ActivityDressCfgArray.Instance.dataArray.Length - 1)
+            //{
+            //    item.m_rewardNum.visible = true;
+            //    int numChange = GameGlobal.myNumericComponent.GetAsInt(NumericType.ActivityDressLastGearRewrdNum);
+            //    item.m_rewardNum.text = string.Format("已兑换次数：{0}/{1}", numChange, 50);
+            //    RedDotController.Instance.SetComRedDot(item.m_RewardBtn.target, false);
+            //}
+            //else
             {
                 item.m_rewardNum.visible = false;
             }
@@ -119,7 +119,7 @@ namespace GFGGame
             int itemCfg = (int)btnGet.data;
 
             UI_ActivityRewardItemUI item = UI_ActivityRewardItemUI.Proxy(_ui.m_List.GetChildAt(itemCfg - 1));
-            if(item.m_RewardBtn.m_c1.selectedIndex == 1)
+            if (item.m_RewardBtn.m_c1.selectedIndex == 1)
             {
                 bool result = await ActivitySProxy.ReqActivityZCJBReward(5006, itemCfg);
                 if (!result) return;
@@ -129,6 +129,14 @@ namespace GFGGame
                 _ui.m_List.numItems = ActivityDressCfgArray.Instance.dataArray.Length;
                 UpdateList();
             }
+            else if (item.m_RewardBtn.m_c1.selectedIndex == 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("请优先兑换前置物品！");
+            }
+            else if (item.m_RewardBtn.m_c1.selectedIndex == 3)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("数量不够！");
+            }
         }
 
         private void RenderRewardItemList(int index, GObject obj)
@@ -141,7 +149,7 @@ namespace GFGGame
         {
             ItemData numItem;
             long num;
-            if (BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            if (BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -149,7 +157,8 @@ namespace GFGGame
             {
                 num = 0;
             }
-            _ui.m_num.text = "金元宝：" + num;
+            ItemCfg item = ItemCfgArray.Instance.GetCfg(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0]);
+            _ui.m_num.text = item.name+ ":" + num;
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBView.cs

@@ -32,6 +32,9 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             modal = true;
+            this.viewCom.Center();
+
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             _ui.m_viewBtn.onClick.Add(OnBtnAdJump);
             _ui.m_rewardBTn.onClick.Add(OnClickShowReward);
             _ui.m_backBtn.onClick.Add(this.Hide);
@@ -45,7 +48,7 @@ namespace GFGGame
         {
             base.OnShown();
             ReqInfo();
-            _ui.m_time.visible = false;
+            //_ui.m_time.visible = false;
             RedDotController.Instance.SetComRedDot(_ui.m_rewardBTn, ActivityDataManager.Instance.CheckZCJBRed(),"",-30);
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, SetRed);
         }
@@ -69,6 +72,11 @@ namespace GFGGame
         }
         private void OnBtnAdJump()
         {
+            if(ActivityDataManager.Instance.isExtendTime(2))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已到期！");
+                return;
+            }
             ActivityFightCfg chapterCfgs = ActivityFightCfgArray.Instance.GetCfg(61001);
             ViewManager.Show<ActivityZCJBChapterView>(new object[] { chapterCfgs.id, 2 });
         }
@@ -78,10 +86,16 @@ namespace GFGGame
         }
         private void OnClickShopBtn()
         {
+            if (ActivityDataManager.Instance.isExtendTime(2))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已到期！");
+                return;
+            }
             ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
         }
         private async void ReqInfo()
         {
+            await ActivitySProxy.SetOnceStatus(5006, 1, 1);
             bool result = await ActivitySProxy.ReqActivityZCJBInfo();
             if (!result) return;
         }

GameClient/Assets/Game/HotUpdate/Views/Card/CardSyntheticView.cs

@@ -294,7 +294,7 @@ namespace GFGGame
             var response = await ClothingSyntheticSProxy.GetCardSyntheticCount(_cardId);
             cardSyntheticCount = response;
             //这里应该是制作卡牌次数
-            _ui.m_btnProduction.grayed = cardSyntheticCount > _cardItem.syntheticTimes;
+            _ui.m_btnProduction.grayed = cardSyntheticCount >= _cardItem.syntheticTimes;
             RedDotController.Instance.SetComRedDot(_ui.m_btnProduction, RedDotDataManager.Instance.CheckCardCanSynthetic(_cardId), "");
             _ui.m_timesText.text = string.Format("合成次数:{0}/{1}", cardSyntheticCount, _cardItem.syntheticTimes);
             ItemData itemCount;

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

@@ -69,7 +69,7 @@ namespace GFGGame
             }
             if (!GetSuitItemController.isAuto)
             {
-                _ui.m_btnShare.visible = true;
+                _ui.m_btnShare.visible = false;
             }
             else
             {

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

@@ -38,6 +38,7 @@ namespace GFGGame
             float height = width * tex.height / tex.width;
             _ui.m_imgRes.SetSize(width, height);
             _ui.m_imgBorder.SetSize(width, height + 12);
+            _ui.m_btnShare.visible = false;
             Timers.inst.AddUpdate(CheckGuide);
         }
 

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

@@ -47,7 +47,7 @@ namespace GFGGame
             // _newCardList = new List<int>((this.viewData as object[])[0] as List<int>);
             if (!GetSuitItemController.isAuto)
             {
-                _ui.m_btnShare.visible = true;
+                _ui.m_btnShare.visible = false;
             }
             else
             {

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

@@ -778,7 +778,7 @@ namespace GFGGame
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
             _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
             _ui.m_btnTea.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(12) == 0 ? false : true;
-            _ui.m_btnActivityZCJB.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(17) == 0 ? false: true;
+            _ui.m_btnActivityZCJB.target.visible = ActivityDataManager.Instance.isExtendTime(2) || ((ActivityDataManager.Instance.GetCurOpenActiveByType(17) == 0) ? false: true);
             _ui.m_btnNewPlayerReward.target.visible = (!ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.AutoNewPlayersTips);
 
             _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
@@ -1360,6 +1360,17 @@ namespace GFGGame
                     return;
                 }
             }
+            //招财进宝弹窗
+            if (GameGlobal.AutoZCJBTips)
+            {
+                GameGlobal.AutoZCJBTips = false;
+                if(ActivityDataManager.Instance.GetCurOpenActiveByType(17) == 0)
+                {
+                    return;
+                }
+                ViewManager.Show<ActivityZCJBView>();
+                return;
+            }
             if (GameGlobal.AutoSevenDayLoginView)
             {
                 if (ActivityDataManager.Instance.CanGetSevenDayBonus())

GameClient/Assets/Game/HotUpdate/Views/Share/ShareView.cs

@@ -44,7 +44,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            //_ui.m_btnShareWB.visible = false;
+            _ui.m_btnShareWB.visible = false;
+            _ui.m_btnShareWX.visible = false;
             _ui.m_btnShareQQ.visible = false;
             _ui.m_btnShareQQZone.visible = false;
             _ui.m_btnShareDouYin.visible = false;