Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/Main/MainUI.xml

@@ -54,7 +54,7 @@
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xe" name="btnRenWu"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kdhoaif" name="btnBag"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnLeague"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kvolsor" name="btnLeague"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xd" name="btnPengYouQuan"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
@@ -68,13 +68,13 @@
       <relation target="" sidePair="left-left,top-top"/>
       <Button title="活动" icon="ui://mfvz4q8kvolsof"/>
     </component>
-    <component id="n78_bhmm" name="btnActivityDay7" src="volsoq" fileName="components/BtnModle1.xml" xy="22,611" group="n89_vols" controller="c1,1">
+    <component id="n78_bhmm" name="btnActivityDay7" src="volsoq" fileName="components/BtnModle1.xml" xy="22,596" group="n89_vols" controller="c1,1">
       <Button title="七日活动" icon="ui://mfvz4q8kvolsoh"/>
     </component>
-    <component id="n75_mbf1" name="btnActivityLuckyBox" src="volsoq" fileName="components/BtnModle1.xml" xy="22,765" group="n89_vols">
+    <component id="n75_mbf1" name="btnActivityLuckyBox" src="volsoq" fileName="components/BtnModle1.xml" xy="22,763" group="n89_vols" controller="c1,1">
       <Button title="镜花水月" icon="ui://mfvz4q8kvolsog"/>
     </component>
-    <group id="n89_vols" name="n89" xy="22,457" size="141,462" group="n52_qqat" advanced="true" layout="vt" excludeInvisibles="true"/>
+    <group id="n89_vols" name="n89" xy="22,457" size="141,463" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true"/>
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1130,1760" group="n59_oju1" advanced="true"/>
     <component id="n73_mzf8" name="btnArena" src="mzf8it" fileName="components/ButtonModle6.xml" xy="71,447" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8in"/>

FGUIProject/assets/Main/package.xml

@@ -639,6 +639,7 @@
     <image id="volsoo" name="zjm_guanggao_point_2.png" path="/imagesNew/"/>
     <image id="volsop" name="zjm_guanggao_zsx.png" path="/imagesNew/"/>
     <component id="volsoq" name="BtnModle1.xml" path="/components/"/>
+    <image id="volsor" name="zjm_gn_yj.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -144,9 +144,9 @@ namespace GFGGame
         /// 输入一段时间（毫秒秒），将时间转换成HH:mm:ss格式
         /// </summary>
         /// <param name="timeMsec"></param>
-        public static string FormattingTimeTo_HHmmss(int timeMsec)
+        public static string FormattingTimeTo_HHmmss(long timeMsec)
         {
-            TimeSpan ts = new TimeSpan(0, 0, timeMsec / 1000);
+            TimeSpan ts = new TimeSpan(0, 0, ((int)timeMsec / 1000));
             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 strS = ts.Seconds.ToString().Length == 1 ? "0" + ts.Seconds : ts.Seconds.ToString();

GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnswerView.cs

@@ -102,7 +102,7 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateTime);
                 return;
             }
-            _ui.m_txtTime.text = string.Format("{0}后开启", TimeUtil.FormattingTimeTo_HHmmss((int)(endTime - curTime)));
+            _ui.m_txtTime.text = string.Format("{0}后开启", TimeUtil.FormattingTimeTo_HHmmss((endTime - curTime)));
 
         }
     }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberView.cs

@@ -176,7 +176,7 @@ namespace GFGGame
         }
         private void OnUpdateTimer(object param)
         {
-            int timeCount = (int)(LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.AdEndTime) - TimeHelper.ServerNow());
+            long timeCount = LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.AdEndTime) - TimeHelper.ServerNow();
             if (timeCount <= 0)
             {
                 _ui.m_btnRecruit.target.touchable = true;

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -153,7 +153,7 @@ namespace GFGGame
             {
                 long curTime = TimeHelper.ServerNow();
                 long endTime = TimeUtil.GetNextTime(GlobalCfgArray.globalCfg.leagueQuestionStartTime);
-                _ui.m_btnAnswer.m_txtTime.text = string.Format("{0}后开启", TimeUtil.FormattingTimeTo_HHmmss((int)(endTime - curTime)));
+                _ui.m_btnAnswer.m_txtTime.text = string.Format("{0}后开启", TimeUtil.FormattingTimeTo_HHmmss((endTime - curTime)));
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -722,7 +722,10 @@ namespace GFGGame
                     _actLuckyBoxId = actLuckyBoxId;
                 }
                 ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
-                _ui.m_btnActivityLuckyBox.target.title = TimeUtil.FormattingTimeTo_DDHHmm(TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow());
+                _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
+
+                long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
+                _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
 
             List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
@@ -737,6 +740,7 @@ namespace GFGGame
                 !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
                 (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT)));
             }
+
             if (_ui.m_btnActivityDay7.target.visible && !ActivityDay7DataManager.Instance.CheckOpen())
             {
                 _ui.m_btnActivityDay7.target.visible = false;