Merge remote-tracking branch 'origin/master' into ios

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/GameConfig.cs

@@ -22,7 +22,8 @@ namespace GFGGame
         public static int showGM;
         //开服时间
         public static long openTime = 0;
-        public static int tiShen;
+        public static int tsStatus;
+        public static int tsServer;
 
         public static void InitData(string json)
         {
@@ -36,9 +37,9 @@ namespace GFGGame
             {
                 openTime = TimeUtil.GetTimestamp(result.openTime);
             }
-            if(!string.IsNullOrEmpty(result.tiShen))
+            if(!string.IsNullOrEmpty(result.tsStatus))
             {
-                tiShen = int.Parse(result.tiShen);
+                tsStatus = int.Parse(result.tsStatus);
             }
             GameConfig.logApiReportUrl = LauncherConfig.logApiRootUrl + "ReportGet";
         }
@@ -48,7 +49,7 @@ namespace GFGGame
             public string loginApiUrl;
             public string showGM;
             public string openTime;
-            public string tiShen;
+            public string tsStatus;
         }
     }
 }

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)

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

@@ -1056,7 +1056,7 @@ namespace GFGGame
         }
         private void CheckAutoShowViews()
         {
-            if (GameConfig.tiShen > 0) return; //提审服不显示弹窗
+            if (GameConfig.tsStatus > 0) return; //提审服不显示弹窗
             if (RoleDataManager.lvl < 10) return;
             if (GuideDataManager.currentGuideId > 0) return;
             if (GameGlobal.AutoShowCompleted) return;

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -28,7 +28,7 @@ namespace GFGGame
         public static string logApiRootUrl;//上报普通日志接口
         public static string logApiReportLauncherUrl;//上报节点日志接口
         public static string apkVersion;
-        //0 正常，1 维护中，2 提审中
+        //0 正常，1 维护中
         public static int serverStatus;
         //0 关闭所有log界面，1 开启后台log界面， 2 开启弹窗log界面
         public static int onDebug;