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

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

@@ -99,6 +99,7 @@ namespace GFGGame
             {
                 Hide();
                 EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_SHOW_VIEW_CLOSE);
+                EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_ANIMATION_WAIT);
             }
         }
 

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

@@ -48,14 +48,20 @@ namespace GFGGame
             _cfgs = DailyLoginCfgArray.Instance.GetCfgsBytype((int)ConstBonusType.Item);
             _cfg = DailyLoginCfgArray.Instance.GetCfgsBytype((int)ConstBonusType.Suit)[0];
             UpdateView();
-            _ui.m_comIcon.m_loaIcon.url = "ui://DailyWelfare/yzhd_dyt_5";
             _ui.m_comIcon.m_loaIcon.data = _cfg;
             GameGlobal.AutoSevenDayLoginView = false;
         }
         private void UpdateView()
         {
             _ui.m_list.numItems = _cfgs.Count;
-
+            if (ActivityDataManager.Instance.sevenDayLoginBonusStatusList[_cfg.id - 1] != ConstBonusStatus.GOT)
+            {
+                _ui.m_comIcon.m_loaIcon.url = "ui://DailyWelfare/yzhd_dyt_5";
+            }
+            else
+            {
+                _ui.m_comIcon.m_loaIcon.url = "ui://DailyWelfare/yzhd_dyt_5_zz";
+            }
             RedDotController.Instance.SetComRedDot(_ui.m_comIcon.target, ActivityDataManager.Instance.sevenDayLoginBonusStatusList[_cfg.id - 1] == ConstBonusStatus.CAN_GET);
         }
         protected override void OnHide()

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

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

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

@@ -156,15 +156,15 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_challgeBtn, "TimeTracingShowView", 4, "进入副本。");
-            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);
+            GuideController.TryGuide(_ui.m_switchBtn.target, "TimeTracingShowView", 7, "点击选择副本。", -1, true, 0, false, false, true);
+            GuideController.TryGuide(_ui.m_makeSuitBtn.target, "TimeTracingShowView", 10, "前往合成套装。", -1, true, 0, false, false, true);
+            GuideController.TryCompleteGuide("TimeTracingShowView", 10);
         }
         protected override void TryCompleteGuide()
         {
             base.TryCompleteGuide();
-            GuideController.TryCompleteGuideIndex("TimeTracingShowView", 9);
-            GuideController.TryCompleteGuide("TimeTracingShowView", 9);
+            GuideController.TryCompleteGuideIndex("TimeTracingShowView", 10);
+            GuideController.TryCompleteGuide("TimeTracingShowView", 10);
         }
     }
 }

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

@@ -206,8 +206,8 @@ namespace GFGGame
         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);
+            GuideController.TryGuide(null, "TimeTracingShowView", 8, "集齐前一套装可前往合成下一套。", - 1, true, 0, false, false, true);
+            GuideController.TryGuide(_ui.m_btnBack, "TimeTracingShowView", 9, "点击返回。", -1, true, 0, false, false, true);
         }
     }
 }