画廊

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

@@ -22,34 +22,34 @@ namespace GFGGame
         /// <summary>
         /// 推荐数据
         /// </summary>
-        public List<PoemGalleryData> RecommendInfos = new List<PoemGalleryData>();
+        public List<PoemGalleryData> RecommendDatas = new List<PoemGalleryData>();
         /// <summary>
         /// 最新数据
         /// </summary>
-        public List<PoemGalleryData> NewestInfos = new List<PoemGalleryData>();
+        public List<PoemGalleryData> NewestDatas = new List<PoemGalleryData>();
 
         /// <summary>
         /// 好友数据
         /// </summary>
-        public List<PoemGalleryData> FrinedInfos = new List<PoemGalleryData>();
+        public List<PoemGalleryData> FrinedDatas = new List<PoemGalleryData>();
 
         /// <summary>
         /// 收藏数据
         /// </summary>
-        public List<PoemGalleryData> FavoriteInfos = new List<PoemGalleryData>();
+        public List<PoemGalleryData> FavoriteDatas = new List<PoemGalleryData>();
 
         /// <summary>
         /// 我的作品数据
         /// </summary>
-        public List<PoemGalleryData> MySelfInfos = new List<PoemGalleryData>();
+        public List<PoemGalleryData> MySelfDatas = new List<PoemGalleryData>();
 
 
         public void Clear()
         {
-            RecommendInfos.Clear();
-            FrinedInfos.Clear();
-            FavoriteInfos.Clear();
-            MySelfInfos.Clear();
+            RecommendDatas.Clear();
+            FrinedDatas.Clear();
+            FavoriteDatas.Clear();
+            MySelfDatas.Clear();
         }
 
     }

GameClient/Assets/Game/HotUpdate/Data/VO/PoemGalleryData.cs

@@ -49,6 +49,10 @@ namespace GFGGame
         /// 临时下载路径
         /// </summary>
         public string PictureTempUrl;
+        /// <summary>
+        /// 作品资源
+        /// </summary>
+        public NTexture Ntexture;
 
     }
 }

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

@@ -33,8 +33,8 @@ namespace GFGGame
         //请求画廊列表,startIndex为0,则更新列表
         public static async ETTask<bool> ReqGalleryList(int sortType, int startIndex, int Count)
         {
-            S2C_GetGalleryRecommendList response = null;
-            response = (S2C_GetGalleryRecommendList)await MessageHelper.SendToServer(new C2S_GetGalleryRecommendList());
+            S2C_GetGalleryList response = null;
+            response = (S2C_GetGalleryList)await MessageHelper.SendToServer(new C2S_GetGalleryList());
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -43,22 +43,43 @@ namespace GFGGame
                     switch (response.SortType)
                     {
                         case (int)GallerySortType.Recommend:
-
+                            list = PoemGalleryDataManager.Instance.RecommendDatas;
                             break;
                         case (int)GallerySortType.Newest:
-
+                            list = PoemGalleryDataManager.Instance.NewestDatas;
                             break;
                         case (int)GallerySortType.Friend:
-
+                            list = PoemGalleryDataManager.Instance.FrinedDatas;
                             break;
                         case (int)GallerySortType.MyCollect:
-
+                            list = PoemGalleryDataManager.Instance.FavoriteDatas;
                             break;
                         case (int)GallerySortType.MyWorks:
-
+                            list = PoemGalleryDataManager.Instance.MySelfDatas;
                             break;
                     }
+                    if (response.StartIndex == 0) list.Clear();
+                    for (int i = 0; i < response.WorksList.Count; i++)
+                    {
 
+                        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;
+                        Timers.inst.StartCoroutine(PictureStorageHelper.DownloadFile(data.PictureTempUrl, (Texture2D texture) =>
+                        {
+                            data.Ntexture = new NTexture(texture);
+                            list.Add(data);
+                        }));
+                    }
 
                     return true;
                 }

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

@@ -30,14 +30,18 @@ namespace GFGGame
                         photoData.LockingStatus = response.PictureInfosA[i].LockingStatus;
                         photoData.SourceType = response.PictureInfosA[i].SourceType;
                         photoData.PictureTempUrl = response.PictureInfosA[i].PictureTempUrl;
-                        ET.Log.Debug("PictureId0:" + photoData.PictureId);
+                        ET.Log.Debug("PictureId0:" + i);
+                        ET.Log.Debug("PictureId1:" + photoData.PictureId);
                         Timers.inst.StartCoroutine(PictureStorageHelper.DownloadFile(photoData.PictureTempUrl, (Texture2D texture) =>
                         {
-                            ET.Log.Debug("PictureId1:" + photoData);
+                            ET.Log.Debug("PictureId2:" + i);
+                            ET.Log.Debug("PictureId3:" + photoData.PictureId);
 
                             photoData.Bytes = texture.EncodeToJPG();
                             photoData.Ntexture = new NTexture(texture);
                         }));
+                        ET.Log.Debug("PictureId5:" + i);
+                        ET.Log.Debug("PictureId6:" + photoData.PictureId);
                         PoemPhotoDataManager.Instance.Add(photoData, (int)PictureSourceType.PersonalAlbum);
                     }
                     for (int i = 0; i < response.PictureInfosB.Count; i++)