画廊

FGUIProject/assets/poem/componentsGallery/ComNormal.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1619" overflow="hidden" opaque="false">
-  <controller name="c1" pages="0,,1,,2," selected="1"/>
+  <controller name="c1" pages="0,,1,,2," selected="2"/>
   <displayList>
     <component id="n11_r9ri" name="btnShop" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="900,56" size="180,113">
       <gearDisplay controller="c1" pages="0,1"/>
@@ -15,10 +15,10 @@
       <Button icon="ui://iyz778gkr9ri11p" selectedIcon="ui://iyz778gkr9ri11h" controller="c1" page="0"/>
     </component>
     <component id="n7_r9ri" name="btnTab1" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="400,204" group="n8_r9ri">
-      <Button checked="true" icon="ui://iyz778gkr9ri11o" selectedIcon="ui://iyz778gkr9ri11g" controller="c1" page="1"/>
+      <Button icon="ui://iyz778gkr9ri11o" selectedIcon="ui://iyz778gkr9ri11g" controller="c1" page="1"/>
     </component>
     <component id="n9_r9ri" name="btnTab2" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="680,204" group="n8_r9ri">
-      <Button icon="ui://iyz778gkr9ri11n" selectedIcon="ui://iyz778gkr9ri11f" controller="c1" page="2"/>
+      <Button checked="true" icon="ui://iyz778gkr9ri11n" selectedIcon="ui://iyz778gkr9ri11f" controller="c1" page="2"/>
     </component>
     <group id="n8_r9ri" name="grpTab" xy="120,204" size="840,83"/>
     <image id="n25_r9ri" name="n25" src="r9ri11e" fileName="imagesGallery/hl_xzbtzt.png" xy="310,309" group="n26_r9ri"/>
@@ -52,7 +52,6 @@
     <image id="n30_r9ri" name="n30" src="r9ri12o" fileName="imagesGallery/hl_ddandik.png" xy="391,660" group="n32_r9ri"/>
     <text id="n31_r9ri" name="n31" xy="231,783" size="617,51" group="n32_r9ri" fontSize="38" color="#ac9b7f" text="排行榜数据正在结算中，请稍后再来!"/>
     <group id="n32_r9ri" name="grpResult" xy="231,660" size="617,298" advanced="true">
-      <gearDisplay controller="c1" pages="2"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>

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

@@ -207,18 +207,18 @@ namespace GFGGame
 
         public string GetThemeTime()
         {
-            long monday = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);//本周一5点
+            long monday = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime) * 1000;//本周一5点
             long startTime = 0;
             long endTime = 0;
-            if ((TimeInfo.Instance.ServerNow() / 1000) < monday)//本周一5点之前显示上周
+            if ((TimeInfo.Instance.ServerNow()) < monday)//本周一5点之前显示上周
             {
-                startTime = TimeUtil.GetLastWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);
-                endTime = TimeUtil.GetLastWeekSundayTime(GlobalCfgArray.globalCfg.galleryClearingTime);
+                startTime = TimeUtil.GetLastWeekMondayTime() * 1000;
+                endTime = TimeUtil.GetLastWeekSundayTime() * 1000;
             }
             else
             {
-                startTime = monday * 1000;
-                endTime = TimeUtil.GetCurWeekSundayTime(GlobalCfgArray.globalCfg.galleryClearingTime) * 1000; ;
+                startTime = monday;
+                endTime = TimeUtil.GetCurWeekSundayTime() * 1000;
             }
             string strStartTime = TimeUtil.FormattingTime3(startTime);
             string strEndTime = TimeUtil.FormattingTime3(endTime); ;
@@ -231,8 +231,8 @@ namespace GFGGame
         /// <returns></returns>
         public bool IsResulting()
         {
-            long monday0 = TimeUtil.GetCurWeekMondayTime();//本周一0点
-            long monday5 = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);//本周一5点
+            long monday0 = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.galleryClearingTime);//本周一结算点
+            long monday5 = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);//本周一刷新点
             long now = TimeInfo.Instance.ServerNow() / 1000;
             return now > monday0 && now < monday5;