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

FGUIProject/assets/Main/package.xml

@@ -622,7 +622,7 @@
     <image id="ktf2o7" name="cj_meirith.png" path="/images/"/>
     <image id="ktf2o8" name="cj_sj_db.png" path="/images/"/>
     <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="volsoc" name="zjm_tb_cz_thlb.png" path="/imagesNew/"/>
     <image id="volsod" name="zjm_tb_cz_xsqg.png" path="/imagesNew/"/>

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,153">
-  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="0">
+  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="2">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -14,20 +14,21 @@
     <component id="n12_nd17" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
-      <Button title="前往" icon="ui://eg2y0ldpittstn4"/>
+      <Button title="领取" icon="ui://eg2y0ldpittstn4"/>
     </component>
     <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="187,56">
       <gearDisplay controller="c1" pages="1"/>
       <Button title="领取" icon="ui://eg2y0ldpwm603f"/>
     </component>
-    <component id="n13_nd17" name="HadGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
-      <gearDisplay controller="c1" pages="2"/>
-      <Button title=" 已领取" icon="ui://eg2y0ldpo9gh4l"/>
-    </component>
     <component id="n11_nd17" name="ContinueBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="204,63">
       <gearDisplay controller="c1" pages="3"/>
       <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>
+    <image id="n19_vnby" name="n19" src="nyhm6" fileName="imagesNew/an_qrhd_ylq_db.png" pkg="eg2y0ldp" xy="844,47" group="n21_vnby"/>
+    <text id="n20_vnby" name="n20" xy="926,52" size="88,39" group="n21_vnby" fontSize="28" color="#683c28" text="已领取"/>
+    <group id="n21_vnby" name="n21" xy="844,47" size="233,51" advanced="true">
+      <gearDisplay controller="c1" pages="2"/>
+    </group>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
     <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
       <item/>

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

@@ -13,7 +13,6 @@ namespace UI.Task
         public GComponent m_NormalReward;
         public GButton m_ComeBt;
         public GButton m_GetRewardBt;
-        public GButton m_HadGet;
         public GButton m_ContinueBt;
         public GTextField m_Level;
         public GList m_RewardList;
@@ -70,7 +69,6 @@ namespace UI.Task
             m_NormalReward = (GComponent)comp.GetChild("NormalReward");
             m_ComeBt = (GButton)comp.GetChild("ComeBt");
             m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
-            m_HadGet = (GButton)comp.GetChild("HadGet");
             m_ContinueBt = (GButton)comp.GetChild("ContinueBt");
             m_Level = (GTextField)comp.GetChild("Level");
             m_RewardList = (GList)comp.GetChild("RewardList");
@@ -83,7 +81,6 @@ namespace UI.Task
             m_NormalReward = null;
             m_ComeBt = null;
             m_GetRewardBt = null;
-            m_HadGet = null;
             m_ContinueBt = null;
             m_Level = null;
             m_RewardList = null;

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

@@ -160,10 +160,13 @@ namespace GFGGame
         public static string FormattingTimeTo_DDHHmm(long timeMsec)
         {
             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>

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

@@ -741,11 +741,16 @@ namespace GFGGame
                 (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();
             UpGiftBox2();

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

@@ -127,13 +127,13 @@ namespace GFGGame
         }
 
         //前往
-        private void OnBtnGoClick(EventContext context)
-        {
-            Hide();
-            var btnGo = context.sender as GObject;
-            if (btnGo == null) return;
-            ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(TaskView).FullName, viewData }, true);
-        }
+        // private void OnBtnGoClick(EventContext context)
+        // {
+        //     Hide();
+        //     var btnGo = context.sender as GObject;
+        //     if (btnGo == null) return;
+        //     ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(TaskView).FullName, viewData }, true);
+        // }
 
 
         private void ListBoxRewardItemRender(int index, GObject obj)
@@ -199,7 +199,7 @@ namespace GFGGame
             //前往
             if (item.m_ComeBt.data == null)
             {
-                item.m_ComeBt.onClick.Add(OnBtnGoClick);
+                item.m_ComeBt.enabled = false;
             }
             item.m_ComeBt.data = id;
         }