zhaoyang %!s(int64=2) %!d(string=hai) anos
pai
achega
ce3a3772cf

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

@@ -213,12 +213,12 @@ namespace GFGGame
             if ((TimeInfo.Instance.ServerNow() / 1000) < monday)//本周一5点之前显示上周
             {
                 startTime = TimeUtil.GetLastWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);
-                endTime = TimeUtil.GetLastWeekSundayTime("23:59:59");
+                endTime = TimeUtil.GetLastWeekSundayTime(GlobalCfgArray.globalCfg.galleryClearingTime);
             }
             else
             {
                 startTime = monday * 1000;
-                endTime = TimeUtil.GetCurWeekSundayTime("23:59:59") * 1000; ;
+                endTime = TimeUtil.GetCurWeekSundayTime(GlobalCfgArray.globalCfg.galleryClearingTime) * 1000; ;
             }
             string strStartTime = TimeUtil.FormattingTime3(startTime);
             string strEndTime = TimeUtil.FormattingTime3(endTime); ;

+ 12 - 0
GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -97,5 +97,17 @@ namespace GFGGame
 
             return str;
         }
+
+        /// <summary>
+        /// 将时间戳转换成yyyy/m/d格式
+        /// </summary>
+        /// <param name="timeSec"></param>
+        public static string FormattingTime4(long timeSec)
+        {
+            DateTime date = TimeInfo.Instance.ToDateTime(timeSec * 1000);
+            string str = date.ToString("yyyy-MM-dd ");
+
+            return str;
+        }
     }
 }

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

@@ -55,7 +55,7 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = _sortType;
             _ui.m_txtName.text = _galleryData.AuthorName;
 
-            string themeTime = PoemGalleryDataManager.Instance.GetThemeTime();
+            string themeTime = TimeUtil.FormattingTime4(_galleryData.CreateTime / 1000);
             GalleryThemeCfg themeCfg = GalleryThemeCfgArray.Instance.GetCfg((int)PoemGalleryDataManager.Instance.ThemeId);
             string themeName = themeCfg.theme;
             _ui.m_txtTheme.text = string.Format("{0}  主题:{1}", themeTime, themeName);// PoemGalleryDataManager.Instance.GetThemeTime();