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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComList.cs

@@ -11,6 +11,7 @@ namespace UI.DailyWelfare
         public UI_Button1 m_btnSevenDayLogin;
         public UI_Button1 m_btnSign;
         public UI_Button1 m_btnSupply;
+        public UI_Button1 m_btnGrowthFund;
         public const string URL = "ui://t8nwuj7ivols22";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ComList";
@@ -62,6 +63,7 @@ namespace UI.DailyWelfare
             m_btnSevenDayLogin = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSevenDayLogin"));
             m_btnSign = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSign"));
             m_btnSupply = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSupply"));
+            m_btnGrowthFund = (UI_Button1)UI_Button1.Create(comp.GetChild("btnGrowthFund"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +74,8 @@ namespace UI.DailyWelfare
             m_btnSign = null;
             m_btnSupply.Dispose();
             m_btnSupply = null;
+            m_btnGrowthFund.Dispose();
+            m_btnGrowthFund = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoEntryView.cs

@@ -246,10 +246,14 @@ namespace GFGGame
         private void UpdateTime(object param)
         {
             long curTime = ActivityDataManager.Instance.GetActivityTime(_activityID);
-            if (curTime <= 0)
+            if (curTime > 0)
             {
                 _ui.m_txtTime.text = "剩余" + TimeUtil.FormattingTimeTo_DDHHmm(curTime);
             }
+            else
+            {
+                _ui.m_txtTime.visible = false;
+            }
         }
 
         private void UpdateRedDots()

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

@@ -172,13 +172,9 @@ namespace GFGGame
         private int ReturnDiscountTimeSuitIndex()
         {
             int count = 0;
-            long endTime;
-            long startTime;
             foreach (var item in zgthdcListCfg)
             {
-                endTime = TimeUtil.DateTimeToTimestamp(item.endTime);
-                startTime = TimeUtil.DateTimeToTimestamp(item.openTime);
-                if (startTime <= TimeHelper.ServerNow() && endTime > TimeHelper.ServerNow())
+                if (IsDisountTime(item))
                 {
                     indexSuit = count;
                     return indexSuit;
@@ -187,6 +183,19 @@ namespace GFGGame
             }
             return indexSuit;
         }
+        private bool IsDisountTime(EverydaySaleCfg item)
+        {
+            if (item.activityId == 6002 && item.openTime == "")
+            {
+                return ActivityGlobalDataManager.Instance.IsActivityOpen(item.activityId);
+            }
+            long second = TimeHelper.ServerNow() - second_CreateRole;
+            if (second < (saleSecondNum * item.id) && second >= (saleSecondNum * (item.id - 1)))
+            {
+                return true;
+            }
+            return false;
+        }
         private void UpdateTime(object param)
         {
             var activityInfo = zgthdcListCfg[indexSuit];

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

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UI.Card;
 using UnityEngine;
+using YooAsset;
 
 namespace GFGGame
 {
@@ -68,9 +69,17 @@ namespace GFGGame
             }
             else
             {
-                item.m_txtTitle.text = string.Format("词牌星级达到{0}星", NumberUtil.GetChiniseNumberText(cardStarCfg.starLvl / 5));
+                item.m_txtTitle.text = string.Format("词牌星级达到{0}星一阶", NumberUtil.GetChiniseNumberText(cardStarCfg.starLvl / 5));
+            }
+            string resPath = ResPathUtil.GetCardAnimationPath(cardData.resources[cardData.resIndex]);
+            if (index == 1 && YooAssets.CheckResExist(resPath))
+            {
+                item.m_txtTips.visible = true;
+            }
+            else
+            {
+                item.m_txtTips.visible = false;
             }
-            item.m_txtTips.visible = cardStarCfg.starLvl == cardData.itemCfg.animationCardStar;
             item.m_c1.selectedIndex = cardData.starRewardsState.ContainsKey(cardStarCfg.starLvl) ? cardData.starRewardsState[cardStarCfg.starLvl] : 0;
 
             if (item.m_btnGet.data == null)

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

@@ -52,6 +52,7 @@ namespace GFGGame
             _ui.m_comList.m_btnSevenDayLogin.target.onClick.Add(OnBtnSevenDayLoginClick);
             _ui.m_comList.m_btnSign.target.onClick.Add(OnBtnSignClick);
             _ui.m_comList.m_btnSupply.target.onClick.Add(OnBtnSupplyClick);
+            _ui.m_comList.m_btnGrowthFund.target.onClick.Add(OnBtnGrowthFundClick);
 
         }
         protected override void AddEventListener()
@@ -69,6 +70,7 @@ namespace GFGGame
 
             _ui.m_comList.m_btnSevenDayLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
             || ActivityDataManager.Instance.AllSevenDayBonusGot());
+            _ui.m_comList.m_btnGrowthFund.target.visible = false;//(RoleDataManager.lvl >=20 && ShopDataManager.Instance.GrowthFundRewardList.Count < GrowthFundCfgArray.Instance.dataArray.Length);
 
             _limitChargeInfo = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLC);
             if (ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.OpenServerCharge).Count > 0)
@@ -180,6 +182,10 @@ namespace GFGGame
         {
             ViewManager.Show<DailySupplyView>();
         }
+        private void OnBtnGrowthFundClick()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_GROWTH_FUND });
+        }
         private void UpdateRedDot()
         {
             for (int i = 0; i < _limitChargeInfo.Count; i++)

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

@@ -89,6 +89,7 @@ namespace GFGGame
                 needNum = SecondCost[0][1];
                 hasNum = ItemDataManager.GetItemNum(SecondCost[0][0]);
                 _ui.m_txtTips.text = string.Format("{0}不足，是否花费{1}{2}进行一次补签？", ItemCfgArray.Instance.GetCfg(FirstCost[0][0]).name, SecondCost[0][1], ItemCfgArray.Instance.GetCfg(SecondCost[0][0]).name);
+                _ui.m_comCostItem.visible = false;
             }
             ItemUtil.UpdateItemAndNeed(_ui.m_comCostItem, itemId, needNum, true);
         }

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs

@@ -183,6 +183,10 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnArena.target, ConstGuideId.ARENA_OPEN, 3, "在这里可以与其他小伙伴比拼搭配哦~");
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);
             GuideController.TryGuide(_ui.m_btnField.target, "TimeTracingShowView", 3, "合成副本可获得奖励和服装哦~");
+            if (!ArenaDataManager.Instance.IsSeasonOpen)
+            {
+                GuideController.TryCompleteGuide(ConstGuideId.ARENA_OPEN, 3);
+            }
         }
         private void PreloadSuitModel()
         {

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

@@ -144,8 +144,8 @@ namespace GFGGame
             StoryLevelCfg storylevel = StoryLevelCfgArray.Instance.GetCfg(MainStoryDataManager.currentLevelCfgId);
             if (_resultData.Result && storylevel.type == 6 && storylevel.subType == 2)
             {
-                //await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
-                await TimeTracingSProxy.ReqGetAppointLevelRewardStatus(TimeTracingDataManager._currentChapterId);
+                await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
+                await TimeTracingSProxy.ReqGetAppointLevelRewardStatus(MainStoryDataManager.currentLevelCfgId);
                 await TimeTracingSProxy.ReqGetSuitRewardStatus();
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreGrowthFundView.cs

@@ -51,13 +51,13 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
             _valueBarController.OnShown();
-
+            _ui.m_txtDailyMoneyCount.text = "4800";
             UpdateView();
             UpdateRedDot();
         }
@@ -72,7 +72,7 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateView);
         }
         private void OnBtnBlackRewardClick()
         {

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelView.cs

@@ -267,8 +267,7 @@ namespace GFGGame
         protected void UpdateCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            MainStoryDataManager.currentLevelCfgId = 100003003;
-            GuideController.TryGuide(_ui.m_level1.target, "TimeTracingShowView", 5, "挑战。");       
+            GuideController.TryGuide(_ui.m_level1.target, "TimeTracingShowView", 5, "挑战。",-1,true,0,false,false,true);       
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingShowView.cs

@@ -156,9 +156,9 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_challgeBtn, "TimeTracingShowView", 4, "进入副本。");
-            GuideController.TryGuide(_ui.m_switchBtn.target, "TimeTracingShowView", 6, "点击选择副本。");
-            GuideController.TryGuide(_ui.m_btnBack, "TimeTracingShowView", 7, "点击返回。");
-            GuideController.TryCompleteGuide("TimeTracingShowView", 7);
+            GuideController.TryGuide(_ui.m_switchBtn.target, "TimeTracingShowView", 6, "点击选择副本。", -1, true, 0, false, false, true);
+            GuideController.TryGuide(_ui.m_makeSuitBtn.target, "TimeTracingShowView", 9, "前往合成套装。", -1, true, 0, false, false, true);
+            GuideController.TryCompleteGuide("TimeTracingShowView", 9);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingSwitchView.cs

@@ -46,10 +46,12 @@ namespace GFGGame
                 }
             }
             DoSpecialEffect();
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
         {
+            Timers.inst.Remove(CheckGuide);
             base.OnHide();
         }
 
@@ -192,5 +194,20 @@ namespace GFGGame
                 //item.y = -_ui.m_List.height * distanceX;
             }
         }
+        private void CheckGuide(object param)
+        {
+            GRoot.inst.touchable = true;
+            if (GuideDataManager.IsGuideFinish("TimeTracingShowView") <= 0)
+                UpdateCheckGuide(null);
+            else
+                Timers.inst.Remove(CheckGuide);
+        }
+
+        protected void UpdateCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(null, "TimeTracingShowView", 7, "集齐前一套装可前往合成下一套。", - 1, true, 0, false, false, true);
+            GuideController.TryGuide(_ui.m_btnBack, "TimeTracingShowView", 8, "点击返回。", -1, true, 0, false, false, true);
+        }
     }
 }