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

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

@@ -14,6 +14,9 @@ namespace GFGGame
             luckyActTsyBonusState.Clear();
             allTsyPlayTimes = 0;
             lastActLimitTsyId = 0;
+
+            limitStlycActBonusState.Clear();
+            allLimitStlycTimes = 0;
             lastActLimitStlycId = 0;
         }
 

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

@@ -15,6 +15,7 @@ namespace GFGGame
                 var data = new RoleLimitData();
                 data.FromMessage(proto);
                 _roleLimitDatas.Add(proto.LimitId, data);
+                EventAgent.DispatchEvent(ConstMessage.NOTICE_LIMIT_CHANGED, proto.LimitId);
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -15,13 +15,14 @@ namespace GFGGame
         private string guideKey;
         private int guideId;
         private int guideIndex;
+        private int _countGuideRect = 0;//需要找到引导对象没有找到对象的帧数计数
         private bool justHint;//仅提示，无遮罩，点击任何地方可关闭引导
         private bool NoTips;//无遮罩，无点击特效
 
         private float compTxtY = 0;//提示语位置
         private string txtContent = "";
         private EffectUI _effectUI1;
-
+        
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -168,6 +169,7 @@ namespace GFGGame
         }
         private void UpdateTime(object param = null)
         {
+            _countGuideRect = 0;
             Timers.inst.AddUpdate(UpdateGuideRect);
         }
         private void UpdateGuideRect(object param = null)
@@ -214,7 +216,13 @@ namespace GFGGame
                     return;
                 }
                 _ui.m_mask.m_guideArea.SetXY(logicScreenPos.x, logicScreenPos.y);
-
+            }
+            else {
+                _countGuideRect += 1;
+                //找不到引导对象3秒后关闭引导界面
+                if (_countGuideRect > 3 * 60) {
+                    this.Hide();
+                }
             }
         }
         private void UpdateStudioMetalGuide(object param)