zhaoyang 2 жил өмнө
parent
commit
6acaf8cd97

+ 1 - 1
FGUIProject/assets/Main/package.xml

@@ -622,7 +622,7 @@
     <image id="ktf2o7" name="cj_meirith.png" path="/images/"/>
     <image id="ktf2o7" name="cj_meirith.png" path="/images/"/>
     <image id="ktf2o8" name="cj_sj_db.png" path="/images/"/>
     <image id="ktf2o8" name="cj_sj_db.png" path="/images/"/>
     <component id="volso9" name="BtnModle.xml" path="/components/"/>
     <component id="volso9" name="BtnModle.xml" path="/components/"/>
-    <image id="volsoa" name="zjm_hd_sj_db.png" path="/imagesNew/"/>
+    <image id="volsoa" name="zjm_hd_sj_db.png" path="/imagesNew/" scale="9grid" scale9grid="28,6,56,12"/>
     <image id="volsob" name="zjm_tb_cz_sc.png" path="/imagesNew/"/>
     <image id="volsob" name="zjm_tb_cz_sc.png" path="/imagesNew/"/>
     <image id="volsoc" name="zjm_tb_cz_thlb.png" path="/imagesNew/"/>
     <image id="volsoc" name="zjm_tb_cz_thlb.png" path="/imagesNew/"/>
     <image id="volsod" name="zjm_tb_cz_xsqg.png" path="/imagesNew/"/>
     <image id="volsod" name="zjm_tb_cz_xsqg.png" path="/imagesNew/"/>

+ 7 - 4
GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -160,10 +160,13 @@ namespace GFGGame
         public static string FormattingTimeTo_DDHHmm(long timeMsec)
         public static string FormattingTimeTo_DDHHmm(long timeMsec)
         {
         {
             TimeSpan ts = new TimeSpan(0, 0, ((int)timeMsec / 1000));
             TimeSpan ts = new TimeSpan(0, 0, ((int)timeMsec / 1000));
-            string strD = ts.Days.ToString().Length == 1 ? "0" + ts.Days : ts.Days.ToString();
-            string strH = ts.Hours.ToString().Length == 1 ? "0" + ts.Hours : ts.Hours.ToString();
-            string strM = ts.Minutes.ToString().Length == 1 ? "0" + ts.Minutes : ts.Minutes.ToString();
-            return string.Format("{0}天{1}小时{2}分", strD, strH, strM);
+            // string strD = ts.Days.ToString().Length == 1 ? "0" + ts.Days : ts.Days.ToString();
+            // string strH = ts.Hours.ToString().Length == 1 ? "0" + ts.Hours : ts.Hours.ToString();
+            // string strM = ts.Minutes.ToString().Length == 1 ? "0" + ts.Minutes : ts.Minutes.ToString();
+            string strD = ts.Days.ToString();
+            string strH = ts.Hours.ToString();
+            string strM = ts.Minutes.ToString();
+            return string.Format("{0}天{1}时{2}分", strD, strH, strM);
         }
         }
 
 
         /// <summary>
         /// <summary>

+ 7 - 2
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -741,11 +741,16 @@ namespace GFGGame
                 (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT)));
                 (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT)));
             }
             }
 
 
-            if (_ui.m_btnActivityDay7.target.visible && !ActivityDay7DataManager.Instance.CheckOpen())
+            _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
+
+            if (_ui.m_btnActivityDay7.target.visible)
             {
             {
-                _ui.m_btnActivityDay7.target.visible = false;
+                long time = ActivityDay7DataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
+                _ui.m_btnActivityDay7.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+
             }
             }
 
 
+
             //特惠礼包/限时礼包窗口内的倒计时
             //特惠礼包/限时礼包窗口内的倒计时
             UpGiftBox1();
             UpGiftBox1();
             UpGiftBox2();
             UpGiftBox2();