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

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

@@ -861,14 +861,15 @@ namespace GFGGame
 #else
             _ui.m_btnTapTapJump.target.visible = false;
 #endif
-            if (RoleDataManager.roleId == 2415787660850823168)
-            {
-                _ui.m_btnTapTapJump.target.visible = true;
-            }
-            else
+            //是否是IOS,并且要验证版本
+#if PT_IosLocal
+            double number = double.Parse(LauncherConfig.apkVersion, CultureInfo.InvariantCulture);
+            if (number > 2.2)
             {
-                _ui.m_btnTapTapJump.target.visible = false;
+                 _ui.m_btnTapTapJump.target.visible = true;
             }
+#endif
+            
             _ui.m_btnGiftBag1.target.visible = false;//ActivityDataManager.Instance.CheckPearRebateTips(6002);
             var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(6002);
             long endTime = 0;