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

* 'master' of http://10.108.64.190:3000/gfg/Client:
  通行证进度条
  通行证
  主界面

# Conflicts:
#	GameClient/Assets/ResIn/UI/Task/Task_fui.bytes

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>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -24,7 +24,6 @@
     <image id="n20_nd17" name="n20" src="uxxstn1" fileName="images/bt_db_dj.png" xy="14,691"/>
     <text id="n21_nd17" name="n21" xy="35,701" size="68,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b18235" autoSize="none" text="等级"/>
     <image id="n35_nd17" name="n35" src="uxxstmh" fileName="images/jdt_bg.png" xy="49,737"/>
-    <image id="n22_nd17" name="n22" src="uxxstmx" fileName="images/jdt_pink_2.png" xy="61,750"/>
     <image id="n32_nd17" name="n32" src="uxxstm3" fileName="images/bt_db_ptzz.png" xy="143,691"/>
     <image id="n31_nd17" name="n31" src="uxxstmp" fileName="images/txz_jlzz_db_pt.png" xy="136,739" size="254,961"/>
     <text id="n37_nd17" name="n37" xy="198,698" size="132,50" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#bd697a" align="center" autoSize="none" text="普通织造"/>
@@ -33,7 +32,10 @@
     <text id="n30_nd17" name="n30" xy="667,701" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" autoSize="none" text="特别织造"/>
     <image id="n29_nd17" name="n29" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="517,714"/>
     <image id="n28_nd17" name="n28" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="822,714" flip="hz"/>
-    <list id="n48_nd17" name="RewardList" xy="2,747" size="1080,790" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u"/>
+    <list id="n48_nd17" name="RewardList" xy="2,747" size="1080,790" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u" autoClearItems="true">
+      <item/>
+      <item/>
+    </list>
     <image id="n36_nd17" name="n36" src="uxxstmu" fileName="images/zsx_flower.png" xy="755,736" size="14,869"/>
     <image id="n26_nd17" name="n26" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="1,1538" size="1080,217"/>
     <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="408,1781" size="266,70">

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -8,6 +8,7 @@
   </controller>
   <controller name="c2" pages="0,能前往,1,不能前往" selected="0"/>
   <displayList>
+    <image id="n19_8pak" name="imageProgress" src="8paktno" fileName="images/jdt_pink_2.jpg" xy="60,-45" size="22,164"/>
     <image id="n6_nd17" name="n6" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="9,10"/>
     <component id="n7_nd17" name="NormalReward" src="mdmdtn5" fileName="components/ComItem001_1.xml" pkg="eg2y0ldp" xy="203,11"/>
     <component id="n12_nd17" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">

FGUIProject/assets/Task/components/ExpProcess.xml

@@ -5,9 +5,9 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n1_e3m1" name="bar" src="uxxstmi" fileName="images/jyt_yellow.png" xy="0,0" size="346,19"/>
-    <image id="n3_e3m1" name="n3" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="-103,-54" pkg="eg2y0ldp"/>
-    <text id="n4_e3m1" name="n4" xy="-55,-27" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
-    <text id="n5_e3m1" name="Level" xy="-54,-15" size="20,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="2"/>
+    <image id="n3_e3m1" name="n3" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="-103,-54"/>
+    <text id="n4_e3m1" name="n4" xy="-56,-27" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
+    <text id="n5_e3m1" name="Level" xy="-80,-18" size="73,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="000"/>
     <text id="n6_e3m1" name="NumProcess" xy="45,-47" size="76,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#7a4e22" align="center" letterSpacing="-1" vars="true" text="{value=0}/{maxValue=100}"/>
     <image id="n7_e3m1" name="n7" src="a0cf2h" fileName="imagesNew/lm_tb.png" pkg="eg2y0ldp" xy="2,-40"/>
   </displayList>

FGUIProject/assets/Task/package.xml

@@ -37,7 +37,6 @@
     <image id="uxxstmu" name="zsx_flower.png" path="/images/"/>
     <image id="uxxstmv" name="lm_biaotizi_12.png" path="/images/"/>
     <image id="uxxstmw" name="jyt_dk_2.png" path="/images/"/>
-    <image id="uxxstmx" name="jdt_pink_2.png" path="/images/"/>
     <image id="uxxstmz" name="an_jian.png" path="/images/"/>
     <image id="uxxstn0" name="cz_an_pink.png" path="/images/"/>
     <image id="uxxstn1" name="bt_db_dj.png" path="/images/"/>
@@ -60,6 +59,7 @@
     <component id="e3m1tnl" name="ExpProcess.xml" path="/components/"/>
     <component id="e3m1tnm" name="ButtonAdd.xml" path="/components/"/>
     <component id="e3m1tnn" name="ButtonReduce.xml" path="/components/"/>
+    <image id="8paktno" name="jdt_pink_2.jpg" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Task" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardItem.cs

@@ -9,6 +9,7 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
+        public GImage m_imageProgress;
         public GComponent m_NormalReward;
         public GButton m_ComeBt;
         public GButton m_GetRewardBt;
@@ -64,6 +65,7 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_imageProgress = (GImage)comp.GetChild("imageProgress");
             m_NormalReward = (GComponent)comp.GetChild("NormalReward");
             m_ComeBt = (GButton)comp.GetChild("ComeBt");
             m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
@@ -75,6 +77,7 @@ namespace UI.Task
         {
             m_c1 = null;
             m_c2 = null;
+            m_imageProgress = null;
             m_NormalReward = null;
             m_ComeBt = null;
             m_GetRewardBt = null;

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;

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -140,6 +140,8 @@ namespace GFGGame
         {
             var item = UI_BattlePassRewardItem.Proxy(obj);
             var level = index + 1;
+            //设置进度
+            item.m_imageProgress.visible = BattlePassTaskDataManager.Instance.GetBattlePassLevel() >= level;
             //这里跳过为0的第一个配置
             var battlePassCfg = _rewardCfgs[level];
             //设置等级