时间工具单位规范

FGUIProject/assets/CommonGame/components/ButtonBack.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="c1" exported="true" pages="0,浅色底,1,深色底" selected="0"/>
   <displayList>
-    <loader id="n4_uyux" name="loaBg" xy="-35,6" size="578,116" url="ui://eg2y0ldpuyuxtj7" autoSize="true">
+    <loader id="n4_uyux" name="loaBg" xy="-35,6" size="578,116" touchable="false" url="ui://eg2y0ldpuyuxtj7" autoSize="true">
       <gearIcon controller="c1" pages="0,1" values="ui://eg2y0ldpuyuxtj7|ui://eg2y0ldpuyuxtj8"/>
     </loader>
     <loader id="n3_uyux" name="icon" xy="0,0" size="90,90" url="ui://eg2y0ldpuyuxtj4" autoSize="true"/>

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -241,7 +241,7 @@ namespace GFGGame
             PoemPhotoSProxy.ReqAllPhotoInfos().Coroutine();
             TravelSProxy.ReqTravelInfo().Coroutine();
             TravelSProxy.ReqTravelGuideInfo().Coroutine();
-            // PoemGallerySProxy.ReqGalleryTheme().Coroutine();
+            PoemGallerySProxy.ReqGalleryTheme().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             EquipDataCache.cacher.autoPlay = storageAutoPlay <= 0 ? false : true;

GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -110,10 +110,10 @@ namespace GFGGame
                 NoticeInfo noticeInfo = NoticeDataManager.Instance.LastNoticeInfo;
                 Debug.Log("noticeTime:" + noticeInfo.time + "  currentTime:" + (TimeInfo.Instance.ServerNow() / 1000));
 
-                int noticeTime = TimeUtil.GetDayTimeBySec(noticeInfo.time * 1000, GlobalCfgArray.globalCfg.refreshTime);
-                int currentTime = TimeUtil.GetDayTimeBySec(TimeInfo.Instance.ServerNow(), GlobalCfgArray.globalCfg.refreshTime);
+                long noticeTime = TimeUtil.GetDayTimeBySec(noticeInfo.time * 1000, GlobalCfgArray.globalCfg.refreshTime);
+                long currentTime = TimeUtil.GetDayTimeBySec(TimeInfo.Instance.ServerNow(), GlobalCfgArray.globalCfg.refreshTime);
                 Debug.Log("noticeTime:" + noticeTime + "  currentTime:" + currentTime);
-                if ((currentTime - noticeTime) / TimeUtil.SECOND_PER_DAY < 3)
+                if ((currentTime - noticeTime) / 1000 / TimeUtil.SECOND_PER_DAY < 3)
                 {
                     ViewManager.Show<SystemNoticeView>(new object[] { NoticeDataManager.Instance.LastNoticeInfo.title, NoticeDataManager.Instance.LastNoticeInfo.content });
                 }

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

@@ -20,8 +20,8 @@ namespace GFGGame
         private Dictionary<int, List<LuckyBoxBonusData>> _dicShowList = new Dictionary<int, List<LuckyBoxBonusData>>();
 
         public int[] luckyBoxIds = new int[] { 2, 3 };//奖池列表
-        public int startTime = 1635157620;
-        public int endTime = 1704038400;
+        public long startTime = 1635157620;
+        public long endTime = 1704038400;
 
         public int times = 0;
         public int luckyBoxId;

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

@@ -9,7 +9,7 @@ namespace GFGGame
     {
         public long mailId;//邮件id
         public string title;//邮件标题
-        public long timeSec;//邮件时间戳，单位秒
+        public long timeSec;//邮件时间戳，单位毫秒
         public string content = "";//邮件内容
         public List<ItemData> rewards;
         public int state;//邮件状态 0未读, 1已读未领取，2已读已领取

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

@@ -207,18 +207,18 @@ namespace GFGGame
 
         public string GetThemeTime()
         {
-            long monday = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime) * 1000;//本周一5点
+            long monday = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);//本周一5点
             long startTime = 0;
             long endTime = 0;
             if ((TimeInfo.Instance.ServerNow()) < monday)//本周一5点之前显示上周
             {
-                startTime = TimeUtil.GetLastWeekMondayTime() * 1000;
-                endTime = TimeUtil.GetLastWeekSundayTime() * 1000;
+                startTime = TimeUtil.GetLastWeekMondayTime();
+                endTime = TimeUtil.GetLastWeekSundayTime();
             }
             else
             {
                 startTime = monday;
-                endTime = TimeUtil.GetCurWeekSundayTime() * 1000;
+                endTime = TimeUtil.GetCurWeekSundayTime();
             }
             string strStartTime = TimeUtil.FormattingTime3(startTime);
             string strEndTime = TimeUtil.FormattingTime3(endTime); ;
@@ -233,9 +233,23 @@ namespace GFGGame
         {
             long monday0 = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.galleryClearingTime);//本周一结算点
             long monday5 = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);//本周一刷新点
-            long now = TimeInfo.Instance.ServerNow() / 1000;
+            long now = TimeInfo.Instance.ServerNow();
             return now > monday0 && now < monday5;
 
         }
+
+        /// <summary>
+        /// 是否为本期作品
+        /// </summary>
+        /// <returns></returns>
+        public bool IsCurThemeWork(long time)
+        {
+            long monday05 = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);//本周一刷新点
+            long nextMonday05 = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.refreshTime);//下周一刷新点
+            return time > monday05 && time < nextMonday05;
+
+        }
+
+
     }
 }

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

@@ -179,7 +179,7 @@ namespace GFGGame
         private List<GiftBagCfg> GetNoneGiftCfg()
         {
             List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>(GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.NONE));
-            
+
             return giftBagCfgs;
         }
         private GiftBagCfg GetStoryLvGiftCfg()
@@ -262,12 +262,12 @@ namespace GFGGame
         /// <returns></returns>
         public string GetEndTime(int giftId)
         {
-            int endTime = 0;
+            long endTime = 0;
             GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
             if (cfg.endTime == "") return "";
 
             endTime = TimeUtil.DateTimeToTimestamp(cfg.endTime);
-            return TimeUtil.FormattingTime(TimeHelper.ServerNowSecs, endTime);
+            return TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
         }
     }
 }

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

@@ -22,7 +22,19 @@ namespace GFGGame
 
         public static int headBorderId = ConstItemID.BORDERID;
 
-        public static List<long> photoDatas { get; set; }
+        private static List<long> _photoDatas = new List<long>();
+        public static List<long> photoDatas
+        {
+            get
+            {
+                return _photoDatas;
+            }
+            set
+            {
+                _photoDatas = value;
+
+            }
+        }
 
         public static int power
         {

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

@@ -11,7 +11,7 @@ namespace GFGGame
         public long PictureId;
 
         /// <summary>
-        /// 创建时间
+        /// 创建时间,毫秒
         /// </summary>
         public long CreationTime;
 

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs

@@ -403,6 +403,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool CheckPutOnFinish()
         {
+            if (EquipDataCache.cacher.suitId > 0) return true;
             List<int> equipDatas = EquipDataCache.cacher.equipDatas;
             bool isLianYiQun = false;
             bool isShangYi = false;

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

@@ -52,7 +52,7 @@ namespace GFGGame
                         MailInfo mailInfo = new MailInfo();
                         mailInfo.mailId = response.mailList[i].MailId;
                         mailInfo.title = response.mailList[i].Tile;
-                        mailInfo.timeSec = response.mailList[i].TimeSec;
+                        mailInfo.timeSec = response.mailList[i].TimeSec * 1000;
                         mailInfo.state = response.mailList[i].Status;
                         mailInfo.hasItem = response.mailList[i].HasItem;
                         // mailInfos.Add(mailInfo);

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

@@ -102,8 +102,9 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    PoemGalleryDataManager.Instance.MyRank = response.MyRank;
                     List<long> list = PoemGalleryDataManager.Instance.RankDatas;
-
+                    list.Clear();
                     for (int i = 0; i < response.RankList.Count; i++)
                     {
                         PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(response.RankList[i].WorksId);

GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -5,9 +5,15 @@ namespace GFGGame
 {
     public partial class TimeUtil
     {
-        public static string FormattingTime(int curTime, int endTime)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curTime">毫秒</param>
+        /// <param name="endTime">毫秒</param>
+        /// <returns></returns>
+        public static string FormattingTime(long curTime, long endTime)
         {
-            int time = endTime - curTime;
+            long time = (endTime / 1000) - (curTime / 1000);
             int days = (int)Math.Floor((decimal)time / TimeUtil.SECOND_PER_DAY);
             if (days >= 1)
             {
@@ -26,9 +32,16 @@ namespace GFGGame
             return string.Format("{0}秒", time);
         }
 
-        public static void FormattingTime(int curTime, int endTime, out int num, out string str)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curTime">毫秒</param>
+        /// <param name="endTime">毫秒</param>
+        /// <param name="num"></param>
+        /// <param name="str"></param>
+        public static void FormattingTime(long curTime, long endTime, out int num, out string str)
         {
-            int time = endTime - curTime;
+            long time = (endTime / 1000) - (curTime / 1000);
             int days = (int)Math.Floor((decimal)time / TimeUtil.SECOND_PER_DAY);
             if (days >= 1)
             {
@@ -53,13 +66,14 @@ namespace GFGGame
             num = minutes;
             str = "秒";
         }
+
         /// <summary>
         /// 将时间戳转换成yyyy/m/d格式
         /// </summary>
-        /// <param name="timeSec"></param>
-        public static string FormattingTime(long timeSec)
+        /// <param name="timeMsec">毫秒</param>
+        public static string FormattingTime(long timeMsec)
         {
-            DateTime date = TimeInfo.Instance.ToDateTime(timeSec * 1000);
+            DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
             string str = date.ToString("yyyy/MM/dd ");
 
             return str;
@@ -67,10 +81,10 @@ namespace GFGGame
         /// <summary>
         /// 将时间戳转换成yyyy-mm-dd hh-mm-ss格式
         /// </summary>
-        /// <param name="timeSec"></param>
-        public static string FormattingTime1(long timeSec)
+        /// <param name="timeMsec">毫秒</param>
+        public static string FormattingTime1(long timeMsec)
         {
-            DateTime date = TimeInfo.Instance.ToDateTime(timeSec);
+            DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
             string str = date.ToString("yyyy-MM-dd HH:mm:ss");
 
             return str;
@@ -78,10 +92,10 @@ namespace GFGGame
         /// <summary>
         /// 将时间戳转换成yyyy.MM.dd格式
         /// </summary>
-        /// <param name="timeSec"></param>
-        public static string FormattingTime2(long timeSec)
+        /// <param name="timeMSec">毫秒</param>
+        public static string FormattingTime2(long timeMSec)
         {
-            DateTime date = TimeInfo.Instance.ToDateTime(timeSec);
+            DateTime date = TimeInfo.Instance.ToDateTime(timeMSec);
             string str = date.ToString("yyyy.MM.dd");
 
             return str;
@@ -101,10 +115,10 @@ namespace GFGGame
         /// <summary>
         /// 将时间戳转换成yyyy/m/d格式
         /// </summary>
-        /// <param name="timeSec"></param>
-        public static string FormattingTime4(long timeSec)
+        /// <param name="timeMsec"></param>
+        public static string FormattingTime4(long timeMsec)
         {
-            DateTime date = TimeInfo.Instance.ToDateTime(timeSec * 1000);
+            DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
             string str = date.ToString("yyyy-MM-dd ");
 
             return str;

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -138,7 +138,7 @@ namespace GFGGame
         }
         private void UpdateShowTime(object param)
         {
-            _ui.m_txtTime.text = string.Format("{0}后刷新", TimeUtil.FormattingTime(TimeHelper.ServerNowSecs, TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.refreshTime)));
+            _ui.m_txtTime.text = string.Format("{0}后刷新", TimeUtil.FormattingTime(TimeHelper.ServerNow(), TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.refreshTime)));
         }
         private void OnClickBtnGo()
         {

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -224,8 +224,8 @@ namespace GFGGame
 
         private void CheckTime(object param = null)
         {
-            int endTime = LuckyBoxDataManager.Instance.endTime;
-            int curTime = TimeHelper.ServerNowSecs;
+            long endTime = LuckyBoxDataManager.Instance.endTime;
+            long curTime = TimeHelper.ServerNow();
             TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
             _ui.m_listBg.GetChildAt(0).asCom.GetChild("txtTime").asTextField.text = string.Format("{0}", num);
             _ui.m_listBg.GetChildAt(0).asCom.GetChild("txtTimeStr").asTextField.text = string.Format("{0}", str);

GameClient/Assets/Game/HotUpdate/Views/Mail/MailView.cs

@@ -14,7 +14,7 @@ namespace GFGGame
         private MailDataManager mailDataMgr;
         private const int _maxMailCount = 300;
         private const int _retainDay = 30;//邮件保存时间
-                                          // private const int _showCount = 5;//?б???????
+                                          // private const int _showCount = 5;//??????????
 
         private int _firstPage = 0;//当前页面
         private int _endPage = 0;//当前页面
@@ -107,7 +107,7 @@ namespace GFGGame
 
             item.m_c1.selectedIndex = mailDataMgr.GetMailState(data);
             item.m_txtTitle.text = data.title;
-            string str = TimeUtil.FormattingTime(TimeHelper.ServerNowSecs, ((int)data.timeSec + _retainDay * TimeUtil.SECOND_PER_DAY));
+            string str = TimeUtil.FormattingTime(TimeHelper.ServerNow(), (data.timeSec + _retainDay * TimeUtil.SECOND_PER_DAY*1000));
             item.m_txtTime.text = string.Format("剩余时间：{0}", str);
             if (item.m_btnLook.data == null)
             {

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

@@ -56,7 +56,7 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = _sortType;
             _ui.m_txtName.text = _galleryData.AuthorName;
 
-            string themeTime = TimeUtil.FormattingTime4(_galleryData.CreateTime / 1000);
+            string themeTime = TimeUtil.FormattingTime4(_galleryData.CreateTime);
             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();

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

@@ -242,6 +242,7 @@ namespace GFGGame
             }
             else//更新列表
             {
+                _ui.m_comNormal.m_c1.selectedIndex = RecommendType.RECOMMEND;
                 UpdateList();
                 UpdateGalleryList();
             }
@@ -477,6 +478,7 @@ namespace GFGGame
             item.m_btnCollect.selected = data.CollectOrNot;
             item.m_btnVote.title = data.VoteCount.ToString();
             item.m_btnVote.selected = data.VoteOrNot;
+            item.m_txtRank.text = data.Rank.ToString();
             item.m_c1.selectedIndex = index < 3 ? index : 3;
 
             if (item.m_loaIcon.data == null)

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs

@@ -121,8 +121,8 @@ namespace GFGGame
         }
         private void UpdateExchangeTime(object param)
         {
-            int endTime = TimeUtil.GetTomorrowTime(GlobalCfgArray.globalCfg.refreshTime);
-            string time = TimeUtil.FormattingTime(TimeHelper.ServerNowSecs, endTime);
+            long endTime = TimeUtil.GetTomorrowTime(GlobalCfgArray.globalCfg.refreshTime);
+            string time = TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
             _ui.m_txtRefreshTime.text = time + "后刷新";
             for (int i = 0; i < _ui.m_listGift.numItems; i++)
             {

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBaseView.cs

@@ -94,7 +94,9 @@ namespace GFGGame
         }
         private void UpdateShowTime(object param)
         {
-            _ui.m_txtTime.text = string.Format("{0}后刷新", TimeUtil.FormattingTime(TimeHelper.ServerNowSecs, GameGlobal.myNumericComponent.GetAsInt(NumericType.DailyResetSecs)));
+            long curTime = TimeHelper.ServerNow();
+            long endTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.DailyResetSecs);
+            _ui.m_txtTime.text = string.Format("{0}后刷新", TimeUtil.FormattingTime(curTime, endTime * 1000));
         }
         private void ListItemRender(int index, GObject obj)
         {

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -83,18 +83,19 @@ namespace GFGGame
             }
             else if (_ui.m_c1.selectedIndex == (int)TravelGuideType.Travel)
             {
-                int endTime = (int)(TravelDataManager.Instance.TravelData.CreationTime / 1000) + TravelDataManager.Instance.TravelData.TravelNeedHour * 5;// * 
-                int curTime = TimeHelper.ServerNowSecs;
+                long endTime = TravelDataManager.Instance.TravelData.CreationTime + TravelDataManager.Instance.TravelData.TravelNeedHour * TimeUtil.SECOND_PER_HOUR * 1000;
+                long curTime = TimeHelper.ServerNow();
                 _ui.m_txtTime.text = string.Format("大约{0}后归来", TimeUtil.FormattingTime(curTime, endTime));
-                Timers.inst.Add(1, endTime - curTime + 2, UpdateTime);
+                int secCount = (int)((endTime - curTime) / 1000);
+                Timers.inst.Add(1, secCount + 2, UpdateTime);
             }
         }
 
         private void UpdateTime(object param)
         {
-            int endTime = (int)(TravelDataManager.Instance.TravelData.CreationTime / 1000) + TravelDataManager.Instance.TravelData.TravelNeedHour * 5;// * TimeUtil.SECOND_PER_HOUR
+            long endTime = TravelDataManager.Instance.TravelData.CreationTime + TravelDataManager.Instance.TravelData.TravelNeedHour * TimeUtil.SECOND_PER_HOUR * 1000;
 
-            int curTime = TimeHelper.ServerNowSecs;
+            long curTime = TimeHelper.ServerNow();
             if (curTime >= endTime)
             {
                 Timers.inst.Remove(UpdateTime);