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

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

@@ -191,7 +191,7 @@ namespace GFGGame
         }
         public void SetGalleryData()
         {
-            if(_dicGalleryData.Count > 30)
+            if(_dicGalleryData.Count > 20)
             {
                 if(GalleryIDList.Count >= 10)
                 {
@@ -200,6 +200,8 @@ namespace GFGGame
                         long id = GalleryIDList[i];
                         if (_dicGalleryData.ContainsKey(id))
                         {
+                            _dicGalleryData[id].Ntexture.Dispose();
+                            _dicGalleryData[id].Ntexture = null;
                             _dicGalleryData.Remove(id);
                         }
                     }
@@ -209,13 +211,15 @@ namespace GFGGame
         }
         public void RemoveGalleryData()
         {
-            if (_dicGalleryData.Count > 30)
+            if (_dicGalleryData.Count > 20)
             {
                 for (int i = 0; i < GalleryIDList.Count; i++)
                 {
                     long id = GalleryIDList[i];
                     if (_dicGalleryData.ContainsKey(id))
                     {
+                        _dicGalleryData[id].Ntexture.Dispose();
+                        _dicGalleryData[id].Ntexture = null;
                         _dicGalleryData.Remove(id);
                     }
                 }           

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioActivityUI.cs

@@ -9,7 +9,6 @@ namespace UI.Studio
         public GComponent target;
         public GLoader m_loaBg;
         public GComponent m_comValueBar;
-        public GButton m_btnBack;
         public GLoader m_btnChageLine;
         public GLoader m_loaRole;
         public GTextField m_activityTitle;
@@ -17,6 +16,7 @@ namespace UI.Studio
         public GButton m_btnReward;
         public GTextField m_activityTipText;
         public GTextField m_txtNum;
+        public GButton m_btnBack;
         public const string URL = "ui://xz8kxrecp4yn5h";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioActivityUI";
@@ -66,7 +66,6 @@ namespace UI.Studio
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
             m_loaRole = (GLoader)comp.GetChild("loaRole");
             m_activityTitle = (GTextField)comp.GetChild("activityTitle");
@@ -74,12 +73,12 @@ namespace UI.Studio
             m_btnReward = (GButton)comp.GetChild("btnReward");
             m_activityTipText = (GTextField)comp.GetChild("activityTipText");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_comValueBar = null;
-            m_btnBack = null;
             m_btnChageLine = null;
             m_loaRole = null;
             m_activityTitle = null;
@@ -87,6 +86,7 @@ namespace UI.Studio
             m_btnReward = null;
             m_activityTipText = null;
             m_txtNum = null;
+            m_btnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -75,11 +75,21 @@ namespace GFGGame
                 _ui.m_card.m_ComCardImgRes.target.width = targetWidth;
                 _ui.m_card.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetBgImgPath("bg_jfyl","jpg");
             }
+            else if (_activityId == 7)
+            {
+                _ui.m_card.target.visible = true;
+                float width = 2560;
+                float height = 1920;
+                float proportion = width / height;
+                float targetWidth = proportion * _ui.target.height;
+                _ui.m_card.m_ComCardImgRes.target.width = targetWidth;
+                _ui.m_card.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetBgImgPath("bg_ryth");
+            }
             else
             {
                 _ui.m_card.target.visible = false;
             }
-            
+            _ui.m_btnTask.target.visible = false;
             UpdateEffect();
             UpdateRedDot();
             UpdateTime();
@@ -224,7 +234,7 @@ namespace GFGGame
                 _effectUIDic.Add("L", EffectUIPool.CreateEffectUI(_ui.m_btnLuckyBox.m_effectHolder, "ui_Activity", "SYJH_icon_tx_L"));
                 _effectUIDic.Add("R", EffectUIPool.CreateEffectUI(_ui.m_btnChapter.m_effectHolder, "ui_Activity", "SYJH_icon_tx_R"));
             }
-            else if (_activityId == 5)
+            else
             {
                 _effectUIDic.Add("All_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffectHolder, "ui_Activity/JFYL_All_tx", "JFYL_All_tx"));
                 _effectUIDic.Add("L", EffectUIPool.CreateEffectUI(_ui.m_btnLuckyBox.m_effectHolder, "ui_Activity/JFYL_Button_L", "JFYL_Button_L"));

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -126,9 +126,17 @@ namespace GFGGame
             item.m_loaTitle.visible = true;
             if (ActivityDataManager.Instance.actLimitChargeId > 0)
             {
-                string path  = "xslc_" + openCfg.res;
-                item.m_loaIcon.url = ResPathUtil.GetActivityPath(path);//"ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
+                //string path  = "xslc_" + openCfg.res;
+                item.m_loaIcon.url = ResPathUtil.GetActivityPath(openCfg.res);//"ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
                 //item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
+                if(openCfg.res == "")
+                {
+                    if (openCfg.id == 509)
+                    {
+                        item.m_loaIcon.url = ResPathUtil.GetActivityPath("hdbn_xslc_suxx", "png"); ;
+                        item.m_loaTitle.visible = false;
+                    }
+                }
                 item.m_loaTitle.visible = false;
             }
             else if (openCfg.id == 501)
@@ -152,9 +160,17 @@ namespace GFGGame
                 item.m_loaIcon.url = ResPathUtil.GetActivityPath("hdbn_xslc_dmdhdwn", "png"); ;
                 item.m_loaTitle.visible = false;
             }
+            else if (openCfg.id == 509)
+            {
+                item.m_loaIcon.url = ResPathUtil.GetActivityPath("hdbn_xslc_suxx", "png"); ;
+                item.m_loaTitle.visible = false;
+            }
             else
             {
-                item.target.visible = false;
+                ActivityOpenCfg OpenCfg = ActivityOpenCfgArray.Instance.GetCfg(openCfg.id);
+                item.m_loaIcon.url = ResPathUtil.GetActivityPath(OpenCfg.res, "png"); ;
+                item.m_loaTitle.visible = false;
+                //item.target.visible = false;
                 UI_Button1.ProxyEnd();
                 return;
             }

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

@@ -7,6 +7,7 @@ using System.Linq;
 using Assets.Game.HotUpdate.Data;
 using System.Collections;
 using System;
+using System.Globalization;
 using GFGGame.Launcher;
 using YooAsset;
 
@@ -564,6 +565,14 @@ namespace GFGGame
         {
 #if PT_DouYouTap
             QDDouYouManager.Instance.JumpInfo();
+#elif PT_IosLocal
+            double number = double.Parse(LauncherConfig.apkVersion, CultureInfo.InvariantCulture);
+            Log.Debug($"一个测试：{number}");
+            if (number > 2.2)
+            {
+                Log.Debug($"一个测试dd：{number}");
+                QDDouYouManagerIos.Instance.Share();
+            }
 #else
             _ui.m_btnTapTapJump.target.visible = false;
 #endif
@@ -852,14 +861,15 @@ namespace GFGGame
 #else
             _ui.m_btnTapTapJump.target.visible = false;
 #endif
-            if (RoleDataManager.roleId == 2415787660850823168)
+            //是否是IOS,并且要验证版本
+#if PT_IosLocal
+            double number = double.Parse(LauncherConfig.apkVersion, CultureInfo.InvariantCulture);
+            if (number > 2.2)
             {
-                _ui.m_btnTapTapJump.target.visible = true;
-            }
-            else
-            {
-                _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;

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

@@ -69,7 +69,7 @@ namespace GFGGame
 
         private bool isPullDown = false;//是否下拉刷新中，刷新中再次下拉不会重新请求更新数据
         private bool isPullUp = false;//是否上拉刷新中，刷新中再次下拉不会重新请求更新数据
-        private int LimitNum = 30;
+        private int LimitNum = 20;
         public override void Dispose()
         {
             if (_ui != null)
@@ -474,7 +474,7 @@ namespace GFGGame
             if (_galleryDatas.Count > LimitNum && PoemGalleryDataManager.Instance.GalleryIDList.Count > LimitNum)
             {
                 PoemGalleryDataManager.Instance.SetGalleryData();
-                int indexList = LimitNum / 6 * 2;
+                int indexList = LimitNum / 8 * 2;
                 _galleryDatas.RemoveRange(0, PoemGalleryDataManager.pageCount);
                 UpdateGalleryList();
                 _list.ScrollToView(indexList);