画廊

FGUIProject/assets/ClothingShop/components/ListGalleryShopItem.xml

@@ -16,7 +16,7 @@
     <group id="n11_r9ri" name="n11" xy="69,242" size="112,46" advanced="true" layout="hz" colGap="11">
       <relation target="" sidePair="center-center"/>
     </group>
-    <image id="n12_r9ri" name="imgOwned" src="hinb1b" fileName="images/fzd_yyy.png" xy="53,153"/>
+    <image id="n12_r9ri" name="imgOwned" src="r9ri6u" fileName="images/jfsc_yyy.png" xy="194,17"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/ClothingShop/package.xml

@@ -70,6 +70,7 @@
     <component id="r9rief" name="ListGalleryShopItem.xml" path="/components/"/>
     <image id="r9ri6r" name="jfsc_xiantiao_1.png" path="/images/"/>
     <component id="r9ri6s" name="ComItem.xml" path="/components/"/>
+    <image id="r9ri6u" name="jfsc_yyy.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/poem/PoemGalleryPreviewUI.xml

@@ -11,8 +11,8 @@
     <graph id="n17_r9ri" name="n17" xy="0,0" size="1080,1920" alpha="0.8" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <loader id="n1_r9ri" name="loaPicture" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchHeight">
-      <relation target="" sidePair="height-height,center-center,middle-middle"/>
+    <loader id="n1_r9ri" name="loaPicture" xy="0,-240" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchHeight">
+      <relation target="" sidePair="height-height"/>
     </loader>
     <component id="n0_r9ri" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>

FGUIProject/assets/poem/PoemUI.xml

@@ -9,6 +9,8 @@
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     <component id="n4_v482" name="comphoto" src="v4822" fileName="components/ComEctype.xml" xy="90,400"/>
-    <component id="n5_r9ri" name="comGallery" src="v4822" fileName="components/ComEctype.xml" xy="96,920"/>
+    <component id="n5_r9ri" name="comGallery" src="v4822" fileName="components/ComEctype.xml" xy="90,920">
+      <property target="icon" propertyId="1" value="ui://iyz778gkr9ri13h"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/poem/componentsGallery/ListItem1.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="500,602">
-  <displayList>
-    <loader id="n15_r9ri" name="loaIcon" xy="4,2" pivot="0.5,0" size="492,522" url="ui://iyz778gkr9ri132" align="center" vAlign="middle" fill="scaleFree"/>
-    <image id="n21_r9ri" name="n21" src="r9ri12h" fileName="imagesGallery/hl_cjkuangdi.png" xy="0,0" size="500,605">
-      <relation target="n15_r9ri" sidePair="height-height"/>
-    </image>
-    <text id="n16_r9ri" name="txtName" xy="20,540" size="187,41" group="n22_r9ri" font="ui://eg2y0ldpkst18" fontSize="30" color="#ac9370" leading="0" letterSpacing="-4" text="名字名字名字啊"/>
-    <component id="n19_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="276,546" group="n22_r9ri">
-      <Button title="50000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>
-    </component>
-    <component id="n20_r9ri" name="btnVote" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="386,546" group="n22_r9ri">
-      <Button title="50000" icon="ui://iyz778gkr9ri124" selectedIcon="ui://iyz778gkr9ri123"/>
-    </component>
-    <group id="n22_r9ri" name="n22" xy="20,540" size="398,42" advanced="true">
-      <relation target="n15_r9ri" sidePair="top-bottom"/>
-    </group>
-  </displayList>
-  <relation target="n15_r9ri" sidePair="height-height"/>
-</component>

FGUIProject/assets/poem/componentsGallery/ListRankItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="996,1004" overflow="hidden">
-  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
     <loader id="n3_r9ri" name="loaIcon" xy="1,0" pivot="0.5,0" size="994,909" url="ui://iyz778gkr9ri132" align="center" vAlign="middle" fill="scaleMatchWidth"/>
     <image id="n11_r9ri" name="n11" src="r9ri120" fileName="imagesGallery/hl_phb_b_1.png" xy="34,4">
@@ -12,6 +12,9 @@
     <image id="n13_r9ri" name="n13" src="r9ri11w" fileName="imagesGallery/hl_phb_b_3.png" xy="34,4">
       <gearDisplay controller="c1" pages="2"/>
     </image>
+    <image id="n16_r9ri" name="n16" src="r9ri13g" fileName="imagesGallery/hl_phb_b_4.png" xy="36,29">
+      <gearDisplay controller="c1" pages="3"/>
+    </image>
     <image id="n9_r9ri" name="n9" src="r9ri11x" fileName="imagesGallery/hl_phb_1.png" xy="0,0" size="996,1009">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="n3_r9ri" sidePair="height-height"/>
@@ -27,7 +30,9 @@
     <image id="n15_r9ri" name="n15" src="r9ri13f" fileName="imagesGallery/hl_phb_4.png" xy="0,-2" size="996,1009">
       <gearDisplay controller="c1" pages="3"/>
     </image>
-    <text id="n7_r9ri" name="txtRank" xy="21,56" size="63,41" fontSize="30" text="第六"/>
+    <text id="n7_r9ri" name="txtRank" xy="78,47" pivot="0.5,0" size="36,72" font="ui://eg2y0ldpwonotj9" fontSize="54" color="#fdf4e6" strokeColor="#d4b06b" strokeSize="2" text="2">
+      <gearDisplay controller="c1" pages="3"/>
+    </text>
     <text id="n4_r9ri" name="txtName" xy="37,928" size="211,41" group="n14_r9ri" fontSize="30" color="#ac806f" text="名字名字名字啊"/>
     <component id="n5_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="740,936" size="32,30" group="n14_r9ri">
       <Button title="5000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>

FGUIProject/assets/poem/package.xml

@@ -52,7 +52,7 @@
     <component id="wono10t" name="ComPostcard.xml" path="/componentsPhoto/"/>
     <component id="r9ri10u" name="PoemGalleryUI.xml" path="/" exported="true"/>
     <component id="r9ri10v" name="Button9.xml" path="/componentsGallery/"/>
-    <component id="r9ri10w" name="ListItem.xml" path="/componentsGallery/" exported="true"/>
+    <component id="r9ri10w" name="ListItem.xml" path="/componentsGallery/"/>
     <component id="r9ri10x" name="ComRank.xml" path="/componentsGallery/"/>
     <component id="r9ri10y" name="ListRankItem.xml" path="/componentsGallery/"/>
     <component id="r9ri114" name="ComNormal.xml" path="/componentsGallery/"/>
@@ -125,7 +125,6 @@
     <component id="r9ritjn" name="PoemGalleryRuleUI.xml" path="/" exported="true"/>
     <image id="r9ri136" name="hl_phjltsts.png" path="/imagesGallery/"/>
     <component id="r9ri137" name="ComFooter.xml" path="/componentsGallery/"/>
-    <component id="r9ri138" name="ListItem1.xml" path="/componentsGallery/" exported="true"/>
     <component id="r9ri139" name="ComScroll.xml" path="/componentsGallery/"/>
     <component id="r9ri13a" name="ComboBox.xml" path="/componentsGallery/"/>
     <image id="r9ri13b" name="hz_dakai.png" path="/componentsGallery/"/>
@@ -133,6 +132,8 @@
     <component id="r9ri13d" name="ComboBox_item.xml" path="/componentsGallery/"/>
     <component id="r9ri13e" name="PoemGalleryRewardGetUI.xml" path="/" exported="true"/>
     <image id="r9ri13f" name="hl_phb_4.png" path="/imagesGallery/" scale="9grid" scale9grid="249,23,498,1120"/>
+    <image id="r9ri13g" name="hl_phb_b_4.png" path="/imagesGallery/"/>
+    <image id="r9ri13h" name="xc_hl.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -123,6 +123,17 @@ namespace GFGGame
             }
             return null;
         }
+        public void UpdateRoleInfo(long workId, string name, int rank = 0)
+        {
+            if (_dicGalleryData.ContainsKey(workId))
+            {
+                _dicGalleryData[workId].AuthorName = name;
+                if (rank > 0)
+                {
+                    _dicGalleryData[workId].Rank = rank;
+                }
+            }
+        }
         public void UpdateFavoriteState(long workId, bool state, long count)
         {
             if (_dicGalleryData.ContainsKey(workId))

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ListItem1.cs

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Poem
-{
-    public partial class UI_ListItem1
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public GTextField m_txtName;
-        public GButton m_btnCollect;
-        public GButton m_btnVote;
-        public const string URL = "ui://iyz778gkr9ri138";
-        public const string PACKAGE_NAME = "Poem";
-        public const string RES_NAME = "ListItem1";
-        private static UI_ListItem1 _proxy;
-
-        public static UI_ListItem1 Create(GObject gObject = null)
-        {
-            var ui = new UI_ListItem1();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ListItem1 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListItem1();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_btnCollect = (GButton)comp.GetChild("btnCollect");
-            m_btnVote = (GButton)comp.GetChild("btnVote");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            m_txtName = null;
-            m_btnCollect = null;
-            m_btnVote = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ListItem1.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e8a25e936285f3a4b96547fca4e3b0d3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -39,7 +39,6 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    // List<PoemGalleryData> list = new List<PoemGalleryData>();
                     List<long> list = new List<long>();
                     switch (response.SortType)
                     {
@@ -62,22 +61,29 @@ namespace GFGGame
                     if (response.StartIndex == 0) list.Clear();
                     for (int i = 0; i < response.WorksList.Count; i++)
                     {
+                        PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(response.WorksList[i].WorksId);
+                        if (data != null)
+                        {
+                            PoemGalleryDataManager.Instance.UpdateRoleInfo(response.WorksList[i].WorksId, response.WorksList[i].AuthorName);
+                        }
+                        else
+                        {
+                            data = new PoemGalleryData();
+                            data.WorkId = response.WorksList[i].WorksId;
+                            data.AuthorId = response.WorksList[i].AuthorId;
+                            data.AuthorName = response.WorksList[i].AuthorName;
+                            data.VoteCount = response.WorksList[i].BelikedCount;
+                            data.CollectCount = response.WorksList[i].BeCollectedCount;
+                            data.VoteOrNot = response.WorksList[i].LikeOrNot;
+                            data.CollectOrNot = response.WorksList[i].CollectOrNot;
+                            data.CreateTime = response.WorksList[i].CreateTime;
+                            data.ThemeOrder = response.WorksList[i].ThemeOrder;
+                            data.ThemeId = response.WorksList[i].ThemeId;
+                            data.PictureTempUrl = response.WorksList[i].PictureTempUrl;
+                            PoemGalleryDataManager.Instance.UpdateGalleryData(data);
 
-                        PoemGalleryData data = new PoemGalleryData();
-                        data.WorkId = response.WorksList[i].WorksId;
-                        data.AuthorId = response.WorksList[i].AuthorId;
-                        data.AuthorName = response.WorksList[i].AuthorName;
-                        data.VoteCount = response.WorksList[i].BelikedCount;
-                        data.CollectCount = response.WorksList[i].BeCollectedCount;
-                        data.VoteOrNot = response.WorksList[i].LikeOrNot;
-                        data.CollectOrNot = response.WorksList[i].CollectOrNot;
-                        data.CreateTime = response.WorksList[i].CreateTime;
-                        data.ThemeOrder = response.WorksList[i].ThemeOrder;
-                        data.ThemeId = response.WorksList[i].ThemeId;
-                        data.PictureTempUrl = response.WorksList[i].PictureTempUrl;
-
+                        }
                         list.Add(data.WorkId);
-                        PoemGalleryDataManager.Instance.UpdateGalleryData(data);
                     }
                     return true;
                 }
@@ -85,14 +91,12 @@ namespace GFGGame
             return false;
         }
 
-        public static IEnumerator Download(List<long> list)
+        public static IEnumerator Download(List<long> list, int startIndex)
         {
-            // ET.Log.Debug("zoya000");
-            for (int i = 0; i < list.Count; i++)
+            for (int i = startIndex; i < list.Count; i++)
             {
-                // ET.Log.Debug("zoya111:  " + list[i]);
-
                 PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(list[i]);
+                if (data.Ntexture != null) continue;
                 using (UnityWebRequest request = UnityWebRequestTexture.GetTexture(data.PictureTempUrl))
                 {
                     yield return request.SendWebRequest();
@@ -107,9 +111,8 @@ namespace GFGGame
                         data.Ntexture = new NTexture(texture);
                     }
                 }
-                // ET.Log.Debug("zoya222:  " + list[i]);
             }
-            // ET.Log.Debug("zoya333:  ");
+            ET.Log.Debug("Download  finish!!!");
             EventAgent.DispatchEvent(ConstMessage.GALLERY_DATA_CHANGE);
         }
 
@@ -228,22 +231,30 @@ namespace GFGGame
 
                     for (int i = 0; i < response.RankList.Count; i++)
                     {
+                        PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(response.RankList[i].WorksId);
+                        if (data != null)
+                        {
+                            PoemGalleryDataManager.Instance.UpdateRoleInfo(response.RankList[i].WorksId, response.RankList[i].AuthorName, i + 1);
+                        }
+                        else
+                        {
 
-                        PoemGalleryData data = new PoemGalleryData();
-                        data.WorkId = response.RankList[i].WorksId;
-                        data.Rank = i + 1;
-                        data.AuthorId = response.RankList[i].AuthorId;
-                        data.AuthorName = response.RankList[i].AuthorName;
-                        data.VoteCount = response.RankList[i].BelikedCount;
-                        data.CollectCount = response.RankList[i].BeCollectedCount;
-                        data.VoteOrNot = response.RankList[i].LikeOrNot;
-                        data.CollectOrNot = response.RankList[i].CollectOrNot;
-                        data.CreateTime = response.RankList[i].CreateTime;
-                        data.ThemeOrder = response.RankList[i].ThemeOrder;
-                        data.ThemeId = response.RankList[i].ThemeId;
-                        data.PictureTempUrl = response.RankList[i].PictureTempUrl;
+                            data = new PoemGalleryData();
+                            data.WorkId = response.RankList[i].WorksId;
+                            data.Rank = i + 1;
+                            data.AuthorId = response.RankList[i].AuthorId;
+                            data.AuthorName = response.RankList[i].AuthorName;
+                            data.VoteCount = response.RankList[i].BelikedCount;
+                            data.CollectCount = response.RankList[i].BeCollectedCount;
+                            data.VoteOrNot = response.RankList[i].LikeOrNot;
+                            data.CollectOrNot = response.RankList[i].CollectOrNot;
+                            data.CreateTime = response.RankList[i].CreateTime;
+                            data.ThemeOrder = response.RankList[i].ThemeOrder;
+                            data.ThemeId = response.RankList[i].ThemeId;
+                            data.PictureTempUrl = response.RankList[i].PictureTempUrl;
+                            PoemGalleryDataManager.Instance.UpdateGalleryData(data);
+                        }
                         list.Add(data.WorkId);
-                        PoemGalleryDataManager.Instance.UpdateGalleryData(data);
 
                     }
                     return true;

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

@@ -121,7 +121,7 @@ namespace GFGGame
             base.AddEventListener();
 
             EventAgent.AddEventListener(ConstMessage.GALLERY_DATA_CHANGE, UpdateGalleryList);
-            // EventAgent.AddEventListener(ConstMessage.GALLERY_RANK_DATA_CHANGE, UpdateGalleryRankList);
+            EventAgent.AddEventListener(ConstMessage.GALLERY_RANK_DATA_CHANGE, UpdateGalleryRankList);
         }
         protected override void OnShown()
         {
@@ -187,8 +187,8 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            // EventAgent.RemoveEventListener(ConstMessage.GALLERY_DATA_CHANGE, UpdateGalleryList);
-            // EventAgent.RemoveEventListener(ConstMessage.GALLERY_RANK_DATA_CHANGE, UpdateGalleryRankList);
+            EventAgent.RemoveEventListener(ConstMessage.GALLERY_DATA_CHANGE, UpdateGalleryList);
+            EventAgent.RemoveEventListener(ConstMessage.GALLERY_RANK_DATA_CHANGE, UpdateGalleryRankList);
         }
 
         private void OnBtnBackClick()
@@ -266,6 +266,7 @@ namespace GFGGame
         private void OnNormalTabChange()
         {
             ResetPullRelease();
+            _ui.m_comNormal.m_comScroll.target.scrollPane.header.visible = false;
             _subtabIndex = _ui.m_comNormal.m_c1.selectedIndex;
             if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.RANK)//排行榜
             {
@@ -276,6 +277,7 @@ namespace GFGGame
             {
                 if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.RECOMMEND)//首页
                 {
+                    _ui.m_comNormal.m_comScroll.target.scrollPane.header.visible = true;
                     if (_ui.m_comNormal.m_comBoBox.selectedIndex == 0)//推荐
                     {
                         _sortType = (int)GallerySortType.Recommend;
@@ -306,6 +308,7 @@ namespace GFGGame
         /// </summary>
         private void OnFavoritesTabChange()
         {
+            _ui.m_comFavorites.m_comScroll.target.scrollPane.header.visible = false;
             _subtabIndex = _ui.m_comFavorites.m_c1.selectedIndex;
             if (_ui.m_comFavorites.m_c1.selectedIndex == FavoritesType.FAVORITE)//我的收藏
             {
@@ -340,7 +343,7 @@ namespace GFGGame
             bool result = await PoemGallerySProxy.ReqGalleryList(_sortType, startIndex, _pageCount);
             if (result)
             {
-                Timers.inst.StartCoroutine(PoemGallerySProxy.Download(_galleryDatas));
+                Timers.inst.StartCoroutine(PoemGallerySProxy.Download(_galleryDatas, startIndex));
             }
         }
         private void UpdateGalleryList()
@@ -367,6 +370,7 @@ namespace GFGGame
             _list1.ResizeToFit();
 
             UpdateView();
+            ResetPullRelease();
         }
 
         //请求排行榜刷新
@@ -410,18 +414,18 @@ namespace GFGGame
             PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(workId);
             UI_ListItem item = UI_ListItem.Proxy(obj);
 
-            if (data.Ntexture == null)
-            {
-                Timers.inst.StartCoroutine(PictureStorageHelper.DownloadFile(data.PictureTempUrl, (Texture2D texture) =>
-                {
-                    data.Ntexture = new NTexture(texture);
-                    item.m_loaIcon.texture = data.Ntexture;
-                }));
-            }
-            else
-            {
-                item.m_loaIcon.texture = data.Ntexture;
-            }
+            // if (data.Ntexture == null)
+            // {
+            //     Timers.inst.StartCoroutine(PictureStorageHelper.DownloadFile(data.PictureTempUrl, (Texture2D texture) =>
+            //     {
+            //         data.Ntexture = new NTexture(texture);
+            //         item.m_loaIcon.texture = data.Ntexture;
+            //     }));
+            // }
+            // else
+            // {
+            item.m_loaIcon.texture = data.Ntexture;
+            // }
             item.m_loaIcon.height = item.m_loaIcon.width * item.m_loaIcon.texture.height / item.m_loaIcon.texture.width;
             item.m_txtName.text = data.AuthorName;
             item.m_btnCollect.title = data.CollectCount.ToString();
@@ -452,18 +456,18 @@ namespace GFGGame
             long workId = _galleryDatas[index];
             PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(workId);
             UI_ListRankItem item = UI_ListRankItem.Proxy(obj);
-            if (data.Ntexture == null)
-            {
-                Timers.inst.StartCoroutine(PictureStorageHelper.DownloadFile(data.PictureTempUrl, (Texture2D texture) =>
-                {
-                    data.Ntexture = new NTexture(texture);
-                    item.m_loaIcon.texture = data.Ntexture;
-                }));
-            }
-            else
-            {
-                item.m_loaIcon.texture = data.Ntexture;
-            }
+            // if (data.Ntexture == null)
+            // {
+            //     Timers.inst.StartCoroutine(PictureStorageHelper.DownloadFile(data.PictureTempUrl, (Texture2D texture) =>
+            //     {
+            //         data.Ntexture = new NTexture(texture);
+            //         item.m_loaIcon.texture = data.Ntexture;
+            //     }));
+            // }
+            // else
+            // {
+            item.m_loaIcon.texture = data.Ntexture;
+            // }
             item.m_loaIcon.height = item.m_loaIcon.width * item.m_loaIcon.texture.height / item.m_loaIcon.texture.width;
 
             item.m_txtName.text = data.AuthorName;
@@ -576,17 +580,18 @@ namespace GFGGame
         private async void onPullDownRelease()
         {
             GComponent header = _comScroll.scrollPane.header;
-            if (header.height < header.sourceHeight || isPullDown) return;
+            if (!header.visible || header.height < header.sourceHeight || isPullDown) return;
 
             isPullDown = true;
             _comScroll.scrollPane.LockHeader(header.sourceHeight);
 
             bool result = await PoemGallerySProxy.ReqGalleryList(_sortType, 0, _pageCount);
-            OnPullDownTimeComplete();
+            // OnPullDownTimeComplete();
             if (result)
             {
-                UpdateGalleryList();
+                Timers.inst.StartCoroutine(PoemGallerySProxy.Download(_galleryDatas, 0));
             }
+
         }
         private void OnPullDownTimeComplete()
         {
@@ -607,10 +612,10 @@ namespace GFGGame
             _comScroll.scrollPane.LockFooter(footer.sourceHeight + 10);
 
             bool result = await PoemGallerySProxy.ReqGalleryList(_sortType, _galleryDatas.Count, _pageCount);
-            OnPullUpTimeComplete();
+            // OnPullUpTimeComplete();
             if (result)
             {
-                UpdateGalleryList();
+                Timers.inst.StartCoroutine(PoemGallerySProxy.Download(_galleryDatas, _galleryDatas.Count));
             }
         }