zhaoyang 2 年之前
父节点
当前提交
81c966b015

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -268,6 +268,7 @@ namespace GFGGame
             NoticeSProxy.ReqSystemNoticeList().Coroutine();
             MailSProxy.ReqMailCount().Coroutine();
             FriendSProxy.ReqAllFriendInfos().Coroutine();
+            PoemGallerySProxy.ReqGalleryTheme().Coroutine();
             ViewManager.Hide<ModalStatusView>();
         }
     }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs

@@ -217,12 +217,12 @@ namespace GFGGame
             if ((TimeInfo.Instance.ServerNow()) < monday)//本周一5点之前显示上周
             {
                 startTime = TimeUtil.GetLastWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingStartTime);
-                endTime = TimeUtil.GetLastWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingEndTime);
+                endTime = TimeUtil.GetLastWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1, GlobalCfgArray.globalCfg.galleryClearingEndTime);
             }
             else
             {
                 startTime = monday;
-                endTime = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingEndTime);
+                endTime = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1, GlobalCfgArray.globalCfg.galleryClearingEndTime);
             }
             string strStartTime = TimeUtil.FormattingTime3(startTime);
             string strEndTime = TimeUtil.FormattingTime3(endTime); ;

+ 12 - 1
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -58,7 +58,7 @@ namespace GFGGame
         // private List<PoemGalleryData> _galleryDatas = new List<PoemGalleryData>();
         private List<long> _galleryDatas = new List<long>();
         private int _sortType = 0;//由GallerySortType定义
-        private int _pageCount = 10;
+        private int _pageCount = 4;
         private int _tabIndex = 0;//当前选中大页签下标,首页0投稿1收藏2
         private int _subtabIndex = 0;//当前选中小页签下标,推荐0好友1排行榜2;我的收藏0我的作品1
 
@@ -363,6 +363,13 @@ namespace GFGGame
         //请求刷新
         private async void ReqGalleryList(int startIndex)
         {
+            if (PoemGalleryDataManager.Instance.IsResulting())
+            {
+                if (_sortType == (int)GallerySortType.Recommend || _sortType == (int)GallerySortType.Newest || _sortType == (int)GallerySortType.Friend)
+                {
+                    return;
+                }
+            }
             bool result = await PoemGallerySProxy.ReqGalleryList(_sortType, startIndex, _pageCount);
             if (result)
             {
@@ -398,6 +405,10 @@ namespace GFGGame
         //请求排行榜刷新
         private async void ReqGalleryRankList()
         {
+            if (PoemGalleryDataManager.Instance.IsResulting())
+            {
+                return;
+            }
             bool result = await PoemGallerySProxy.ReqRankList();
             if (result)
             {