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

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

@@ -9,6 +9,7 @@ namespace GFGGame
 {
     public class PoemGalleryDataManager : SingletonBase<PoemGalleryDataManager>
     {
+        public bool waitRelease = false;
         public const int pageCount = 10;
         private long _themeOrder = 0;
         /// <summary>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -49,6 +49,7 @@ namespace UI.Main
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle1 m_btnNewPlayerReward;
         public UI_BtnModle3 m_btnSevenReward;
+        public UI_BtnModle1 m_btnTapTapJump;
         public UI_BtnModle1 m_btnPearRebate;
         public UI_BtnModle1 m_btnNewYearRedEnvelope;
         public UI_BtnModle1 m_btnActivityDay7;
@@ -147,6 +148,7 @@ namespace UI.Main
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnNewPlayerReward = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewPlayerReward"));
             m_btnSevenReward = (UI_BtnModle3)UI_BtnModle3.Create(comp.GetChild("btnSevenReward"));
+            m_btnTapTapJump = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnTapTapJump"));
             m_btnPearRebate = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnPearRebate"));
             m_btnNewYearRedEnvelope = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewYearRedEnvelope"));
             m_btnActivityDay7 = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityDay7"));
@@ -230,6 +232,8 @@ namespace UI.Main
             m_btnNewPlayerReward = null;
             m_btnSevenReward.Dispose();
             m_btnSevenReward = null;
+            m_btnTapTapJump.Dispose();
+            m_btnTapTapJump = null;
             m_btnPearRebate.Dispose();
             m_btnPearRebate = null;
             m_btnNewYearRedEnvelope.Dispose();

GameClient/Assets/Game/HotUpdate/ServerProxy/MatchingCompetitionSproxy.cs

@@ -278,6 +278,14 @@ namespace GFGGame
         {
             var response = (S2C_GetPreviousWorksCollection)await MessageHelper.SendToServer(new C2S_GetPreviousWorksCollection { });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+       
+            foreach (var data in MatchingCompetitionDataManager.Instance._BeforeWorksList)
+            {
+                data.Bytes = null;
+                data.WorksInfo = null;
+                data.Ntexture?.Dispose();
+            }
+            
             MatchingCompetitionDataManager.Instance._BeforeWorksList.Clear();
             foreach (var item in response.WorksCollectionList)
             {
@@ -293,6 +301,14 @@ namespace GFGGame
         {
              var response = (S2C_GetOldJudgingRoundRankList)await MessageHelper.SendToServer(new C2S_GetOldJudgingRoundRankList { JudgingRoundOpenId = id});
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            
+            foreach (var data in MatchingCompetitionDataManager.Instance._BeforeRankList)
+            {
+                data.Bytes = null;
+                data.JudgingInfo = null;
+                data.Ntexture?.Dispose();
+            }
+            
             MatchingCompetitionDataManager.Instance._BeforeRankList.Clear();
             foreach (var item in response.JudgingRoundRoleInfoList)
             {
@@ -310,6 +326,13 @@ namespace GFGGame
         {
             var response = (S2C_GetJudgingRoundWorksList)await MessageHelper.SendToServer(new C2S_GetJudgingRoundWorksList { });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            
+            foreach (var data in MatchingCompetitionDataManager.Instance.MatchingPhotoInfos)
+            {
+                data.Bytes = null;
+                data.Ntexture?.Dispose();
+            }
+            
             MatchingCompetitionDataManager.Instance.MatchingPhotoInfos.Clear();
             foreach (var item in response.JudgingRoundRoleInfoList)
             {

GameClient/Assets/Game/HotUpdate/ServerProxy/PictureStorageHelper.cs

@@ -48,6 +48,7 @@ namespace GFGGame
                 yield return DownloadPicture(data, count);
             }
             if (callBack != null) callBack();
+            PoemGalleryDataManager.Instance.waitRelease = false;
             ET.Log.Debug("Download  finish!!!");
         }
         private static IEnumerator DownloadPicture(PoemGalleryData data, int count)

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

@@ -142,6 +142,7 @@ namespace GFGGame
             _ui.m_btnNewPlayerReward.target.onClick.Add(OnClickNewPlayerReward);
             _ui.m_btnSevenReward.target.onClick.Add(OnClickSevenReward);
             _ui.m_btnPearRebate.target.onClick.Add(OnClickPearRabate);
+            _ui.m_btnTapTapJump.target.onClick.Add(OnClickTapTapJump);
             _btnGallery.onClick.Add(OnClickGallery);
             _btnPoem.onClick.Add(OnClickPoem);
 
@@ -559,7 +560,14 @@ namespace GFGGame
         {
             ViewManager.Show<PearRebateTipsView>();
         }
-
+        private void OnClickTapTapJump()
+        {
+#if PT_DouYouTap
+            QDDouYouManager.Instance.JumpInfo();
+#else
+            _ui.m_btnTapTapJump.target.visible = false;
+#endif
+        }
         private void OnClickBtnYouJian()
         {
             ViewManager.Show<MailView>();
@@ -839,7 +847,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
+            _ui.m_btnTapTapJump.target.visible = false;
+#endif
+            if (RoleDataManager.roleId == 2415787660850823168)
+            {
+                _ui.m_btnTapTapJump.target.visible = true;
+            }
+            else
+            {
+                _ui.m_btnTapTapJump.target.visible = false;
+            }
             _ui.m_btnGiftBag1.target.visible = false;//ActivityDataManager.Instance.CheckPearRebateTips(6002);
             var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(6002);
             long endTime = 0;

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -754,6 +754,10 @@ namespace GFGGame
         private async void OnPullDownRelease()
         {
             if (!_comScroll.m_comHeader.target.visible || _scrollList.scrollPane.header.height < _scrollList.scrollPane.header.sourceHeight || isPullDown) return;
+            if(PoemGalleryDataManager.Instance.waitRelease)
+            {
+                return;
+            }
 
             isPullDown = true;
             _scrollList.scrollPane.LockHeader(_scrollList.scrollPane.header.sourceHeight);
@@ -762,6 +766,7 @@ namespace GFGGame
             // OnPullDownTimeComplete();
             if (result && isShowing)
             {
+                PoemGalleryDataManager.Instance.waitRelease = true;
                 Timers.inst.StartCoroutine(PictureStorageHelper.Download(_galleryDatas, 0, UpdateGalleryList));
             }
 
@@ -782,6 +787,10 @@ namespace GFGGame
         {
             GComponent header = _scrollList.scrollPane.header;
             if (!header.visible || header.height > header.sourceHeight || isPullDown) return;
+            if (PoemGalleryDataManager.Instance.waitRelease)
+            {
+                return;
+            }
 
             GComponent footer = _scrollList.scrollPane.footer;
             if (footer.height <= footer.sourceHeight || isPullUp) return;
@@ -793,6 +802,7 @@ namespace GFGGame
             bool result = await PoemGallerySProxy.ReqGalleryList(_sortType, _galleryDatas.Count, PoemGalleryDataManager.pageCount);
             if (result && isShowing)
             {
+                PoemGalleryDataManager.Instance.waitRelease = true;
                 Timers.inst.StartCoroutine(PictureStorageHelper.Download(_galleryDatas, _lastGalleryDatasCount, UpdateGalleryList));
             }
         }