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

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxVideoView.cs

@@ -121,9 +121,11 @@ namespace GFGGame
 
         public void Hide()
         {
+            videoPlayer.Pause();
             StopAllCoroutines();
             videoPlayer.Stop();
             videoPlayer.loopPointReached -= OnVideoEnded;
+            videoPlayer.targetTexture.Release();
             handle.Release();
             handle = null;
             videoHandle.Release();

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

@@ -856,19 +856,19 @@ namespace GFGGame
 
             _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
             _ui.m_btnPearRebate.target.visible = ActivityDataManager.Instance.CheckPearRebateTips(6000);
-#if PT_DouYouTap
-            _ui.m_btnTapTapJump.target.visible = true;
-#else
+//#if PT_DouYouTap
+//            _ui.m_btnTapTapJump.target.visible = true;
+//#else
             _ui.m_btnTapTapJump.target.visible = false;
-#endif
+//#endif
             //是否是IOS,并且要验证版本
-#if PT_IosLocal
-            double number = double.Parse(LauncherConfig.apkVersion, CultureInfo.InvariantCulture);
-            if (number > 2.2)
-            {
-                 _ui.m_btnTapTapJump.target.visible = true;
-            }
-#endif
+//#if PT_IosLocal
+//            double number = double.Parse(LauncherConfig.apkVersion, CultureInfo.InvariantCulture);
+//            if (number > 2.2)
+//            {
+//                 _ui.m_btnTapTapJump.target.visible = true;
+//            }
+//#endif
             
             _ui.m_btnGiftBag1.target.visible = false;//ActivityDataManager.Instance.CheckPearRebateTips(6002);
             var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(6002);