限时活动

FGUIProject/assets/CommonGame/package.xml

@@ -348,6 +348,7 @@
     <image id="volstc1" name="wp_bg_yuan.png" path="/imagesNew/"/>
     <image id="volstc2" name="wp_own.png" path="/imagesNew/"/>
     <component id="volstnk" name="ComItem003.xml" path="/components/" exported="true"/>
+    <image id="9jv65o" name="lm_fl_db.png" path="/bgimg/" exported="true" scale="9grid" scale9grid="269,993,538,25"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/ComList.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="987,1514" overflow="scroll">
+  <displayList>
+    <component id="n4_fqor" name="btnLimitChargeAddUp" src="qik1u" fileName="components/Button1.xml" xy="0,0" group="n30_idkd" controller="c1,1,c2,0">
+      <Button title="限时累充" icon="ui://t8nwuj7ivols1q"/>
+      <property target="title" propertyId="1" value="ui://t8nwuj7ivols1o"/>
+    </component>
+    <component id="n5_fqor" name="btnSevenDayLogin" src="qik1u" fileName="components/Button1.xml" xy="0,351" group="n30_idkd" controller="c2,1">
+      <Button title="一周黄历" icon="ui://t8nwuj7ivols20"/>
+      <property target="title" propertyId="1" value="ui://t8nwuj7ivols1z"/>
+    </component>
+    <component id="n28_idkd" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,702" group="n30_idkd" controller="c2,2">
+      <Button title="每日签到" icon="ui://t8nwuj7ivols1y"/>
+      <property target="title" propertyId="1" value="ui://t8nwuj7ivols1m"/>
+    </component>
+    <component id="n29_idkd" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,1053" group="n30_idkd" controller="c2,3">
+      <Button title="每日补给" icon="ui://t8nwuj7ivols1x"/>
+      <property target="title" propertyId="1" value="ui://t8nwuj7ivols21"/>
+    </component>
+    <group id="n30_idkd" name="n30" xy="0,0" size="987,1393" advanced="true" layout="vt" lineGap="11" excludeInvisibles="true"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -4,25 +4,20 @@
     <loader id="n27_fqor" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n0_fqor" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n3_fqor">
+    <image id="n31_vols" name="n31" src="9jv65o" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-77,0" size="1235,2071" aspect="true"/>
+    <component id="n0_fqor" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n3_fqor" visible="false">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n1_fqor" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n3_fqor">
+    <component id="n1_fqor" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n3_fqor">
       <Button icon="ui://t8nwuj7ifqor1"/>
     </component>
-    <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,191"/>
-    <component id="n4_fqor" name="btnLimitChargeAddUp" src="qik1u" fileName="components/Button1.xml" xy="0,360" group="n30_idkd">
-      <Button title="限时累充"/>
+    <group id="n3_fqor" name="grpTop" xy="0,80" size="1080,96"/>
+    <component id="n4_fqor" name="comList" src="vols22" fileName="ComList.xml" xy="46,195" size="987,1724">
+      <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n5_fqor" name="btnSevenDayLogin" src="qik1u" fileName="components/Button1.xml" xy="0,742" group="n30_idkd">
-      <Button title="一周黄历"/>
-    </component>
-    <component id="n28_idkd" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,1124" group="n30_idkd">
-      <Button title="每日签到"/>
-    </component>
-    <component id="n29_idkd" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,1506" group="n30_idkd">
-      <Button title="每日补给"/>
-    </component>
-    <group id="n30_idkd" name="n30" xy="0,360" size="1080,1474" advanced="true" layout="vt" lineGap="54" excludeInvisibles="true"/>
+    <image id="n32_vols" name="n32" src="vols1s" fileName="images/hdrk_biaotz.png" xy="232,54"/>
+    <image id="n34_vols" name="n34" src="vols1t" fileName="images/hdrk_zz.png" xy="43,1667">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </image>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/Button1.xml

@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,328" overflow="hidden" extention="Button">
+<component size="987,340" overflow="hidden" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" exported="true" pages="0,,1," selected="0">
+    <remark page="0" value="不显示时间"/>
+    <remark page="1" value="显示时间"/>
+  </controller>
+  <controller name="c2" exported="true" pages="0,,1,,2,,3," selected="0">
+    <remark page="0" value="限时累充标题位置"/>
+    <remark page="1" value="七天登录标题位置"/>
+    <remark page="2" value="每日签到标题位置"/>
+    <remark page="3" value="每日补给标题位置"/>
+  </controller>
   <displayList>
-    <image id="n0_qik1" name="n0" src="ox5bg" fileName="images/yzhd_dyt_5.png" xy="0,-107" size="1080,961" aspect="true">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_qik1" name="title" xy="479,207" size="122,41" fontSize="30" align="center" vAlign="middle" singleLine="true" text="每日签到">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
+    <image id="n2_vols" name="n2" src="vols1w" fileName="images/hdbn_db.png" xy="38,10"/>
+    <loader id="n3_vols" name="loaIcon" xy="31,20" pivot="0.5,0.5" size="924,297" url="ui://t8nwuj7ivols1y" autoSize="true"/>
+    <loader id="n5_vols" name="loaTitle" xy="407,52" pivot="0.5,0.5" size="530,155" url="ui://t8nwuj7ivols1n" autoSize="true">
+      <gearXY controller="c2" pages="1,2,3" values="466,82|407,63|466,65" default="407,52"/>
+    </loader>
+    <image id="n4_vols" name="n4" src="vols1r" fileName="images/hdbn_zsx.png" xy="0,27"/>
+    <image id="n7_vols" name="n7" src="vols1v" fileName="images/hd_sj_dkuang.png" xy="425,263" group="n8_vols"/>
+    <text id="n6_vols" name="txtTime" xy="596,268" pivot="0.5,0" size="260,42" group="n8_vols" font="ui://eg2y0ldpa0cftkx" fontSize="30" color="#fffcf7" text="剩余时间：5天30分"/>
+    <group id="n8_vols" name="grpTime" xy="425,263" size="493,54" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
   </displayList>
   <Button/>
+  <customProperty target="title" propertyId="1"/>
 </component>

FGUIProject/assets/DailyWelfare/package.xml

@@ -61,10 +61,10 @@
     <component id="idkd1k" name="ComSignBg.xml" path="/components/"/>
     <component id="idkd1l" name="ComSignTop.xml" path="/components/"/>
     <image id="vols1m" name="hdbn_wz_mrqd.png" path="/images/"/>
-    <image id="vols1n" name="hdbn_wz_xslc_wylh.png" path="/images/"/>
-    <image id="vols1o" name="hdbn_wz_xslc_xslgt.png" path="/images/"/>
-    <image id="vols1p" name="hdbn_xslc_wylh.png" path="/images/"/>
-    <image id="vols1q" name="hdbn_xslc_xslgt.png" path="/images/"/>
+    <image id="vols1n" name="hdbn_wz_xslc_wylh.png" path="/images/" exported="true"/>
+    <image id="vols1o" name="hdbn_wz_xslc_xslgt.png" path="/images/" exported="true"/>
+    <image id="vols1p" name="hdbn_xslc_wylh.png" path="/images/" exported="true"/>
+    <image id="vols1q" name="hdbn_xslc_xslgt.png" path="/images/" exported="true"/>
     <image id="vols1r" name="hdbn_zsx.png" path="/images/"/>
     <image id="vols1s" name="hdrk_biaotz.png" path="/images/"/>
     <image id="vols1t" name="hdrk_zz.png" path="/images/"/>
@@ -76,6 +76,7 @@
     <image id="vols1z" name="hdbn_qtdl.png" path="/images/"/>
     <image id="vols20" name="hdbn_qtdl_kqdnf.png" path="/images/"/>
     <image id="vols21" name="hdbn_wz_mrbj.png" path="/images/"/>
+    <component id="vols22" name="ComList.xml" path="/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/League/LeagueGiftUI.xml

@@ -5,7 +5,7 @@
     <loader id="n14_9jv6" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n0_pvb4" name="n0" src="9jv65o" fileName="images/lm_fl_db.png" xy="0,110">
+    <image id="n0_pvb4" name="n0" src="9jv65o" fileName="images/lm_fl_db.png" xy="0,110" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" size="111,96"/>

FGUIProject/assets/League/LeagueSkillUI.xml

@@ -4,7 +4,7 @@
     <loader id="n0_pvb4" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n15_miy3" name="n15" src="9jv65o" fileName="images/lm_fl_db.png" xy="-31,21" size="1144,1898">
+    <image id="n15_miy3" name="n15" src="9jv65o" fileName="images/lm_fl_db.png" xy="-31,21" size="1144,1898" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n16_miy3" name="n16" src="miy37f" fileName="images/lm_ch_zsx.png" xy="67,243"/>

FGUIProject/assets/League/package.xml

@@ -127,7 +127,6 @@
     <image id="9jv65k" name="lm_dt_tsdb.png" path="/images/"/>
     <image id="9jv65l" name="lm_dt_tsdk.png" path="/images/"/>
     <image id="9jv65n" name="lm_fgx.png" path="/images/"/>
-    <image id="9jv65o" name="lm_fl_db.png" path="/images/" scale="9grid" scale9grid="269,993,538,25"/>
     <image id="9jv65p" name="lm_kp_db.png" path="/images/"/>
     <image id="9jv65s" name="lm_kp_db2_dlq.png" path="/images/"/>
     <image id="9jv65t" name="lm_kp_db_chang.png" path="/images/"/>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_Button1.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_Button1
+    {
+        public GButton target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GLoader m_loaIcon;
+        public GLoader m_loaTitle;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public const string URL = "ui://t8nwuj7iqik1u";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "Button1";
+        private static UI_Button1 _proxy;
+
+        public static UI_Button1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button1();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_loaIcon = null;
+            m_loaTitle = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_Button1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a507bd0f0c0cbed4faf2d29fdd621a10
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComList.cs

@@ -0,0 +1,84 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ComList
+    {
+        public GComponent target;
+        public UI_Button1 m_btnLimitChargeAddUp;
+        public UI_Button1 m_btnSevenDayLogin;
+        public UI_Button1 m_btnSign;
+        public UI_Button1 m_btnSupply;
+        public const string URL = "ui://t8nwuj7ivols22";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ComList";
+        private static UI_ComList _proxy;
+
+        public static UI_ComList Create(GObject gObject = null)
+        {
+            var ui = new UI_ComList();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComList Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComList();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_btnLimitChargeAddUp = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLimitChargeAddUp"));
+            m_btnSevenDayLogin = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSevenDayLogin"));
+            m_btnSign = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSign"));
+            m_btnSupply = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSupply"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnLimitChargeAddUp.Dispose();
+            m_btnLimitChargeAddUp = null;
+            m_btnSevenDayLogin.Dispose();
+            m_btnSevenDayLogin = null;
+            m_btnSign.Dispose();
+            m_btnSign = null;
+            m_btnSupply.Dispose();
+            m_btnSupply = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComList.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ef4ede327461b9440824715c88345f49
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailyWelfareUI.cs

@@ -10,10 +10,7 @@ namespace UI.DailyWelfare
         public GLoader m_loaBg;
         public GComponent m_comValueBar;
         public GButton m_btnback;
-        public GButton m_btnLimitChargeAddUp;
-        public GButton m_btnSevenDayLogin;
-        public GButton m_btnSign;
-        public GButton m_btnSupply;
+        public UI_ComList m_comList;
         public const string URL = "ui://t8nwuj7ifqor0";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "DailyWelfareUI";
@@ -64,20 +61,15 @@ namespace UI.DailyWelfare
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnback = (GButton)comp.GetChild("btnback");
-            m_btnLimitChargeAddUp = (GButton)comp.GetChild("btnLimitChargeAddUp");
-            m_btnSevenDayLogin = (GButton)comp.GetChild("btnSevenDayLogin");
-            m_btnSign = (GButton)comp.GetChild("btnSign");
-            m_btnSupply = (GButton)comp.GetChild("btnSupply");
+            m_comList = (UI_ComList)UI_ComList.Create(comp.GetChild("comList"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_comValueBar = null;
             m_btnback = null;
-            m_btnLimitChargeAddUp = null;
-            m_btnSevenDayLogin = null;
-            m_btnSign = null;
-            m_btnSupply = null;
+            m_comList.Dispose();
+            m_comList = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -45,10 +45,10 @@ namespace GFGGame
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             // _ui.m_list.itemRenderer = ListItemRender;
-            _ui.m_btnLimitChargeAddUp.onClick.Add(OnBtnLimitChargeAddUpClick);
-            _ui.m_btnSevenDayLogin.onClick.Add(OnBtnSevenDayLoginClick);
-            _ui.m_btnSign.onClick.Add(OnBtnSignClick);
-            _ui.m_btnSupply.onClick.Add(OnBtnSupplyClick);
+            _ui.m_comList.m_btnLimitChargeAddUp.target.onClick.Add(OnBtnLimitChargeAddUpClick);
+            _ui.m_comList.m_btnSevenDayLogin.target.onClick.Add(OnBtnSevenDayLoginClick);
+            _ui.m_comList.m_btnSign.target.onClick.Add(OnBtnSignClick);
+            _ui.m_comList.m_btnSupply.target.onClick.Add(OnBtnSupplyClick);
 
         }
         protected override void AddEventListener()
@@ -60,27 +60,50 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("mrqd_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hdrk_bg");
 
             _valueBarController.OnShown();
 
-            _ui.m_btnLimitChargeAddUp.visible = ActivityDataManager.Instance.actLimitChargeId > 0;
-            _ui.m_btnSevenDayLogin.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
+            _ui.m_comList.m_btnSevenDayLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
             || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
 
+            _ui.m_comList.m_btnLimitChargeAddUp.target.visible = ActivityDataManager.Instance.actLimitChargeId > 0;
+            if (ActivityDataManager.Instance.actLimitChargeId > 0)
+            {
+                ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
+                _ui.m_comList.m_btnLimitChargeAddUp.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
+                _ui.m_comList.m_btnLimitChargeAddUp.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
+            }
+
+            if (ActivityDataManager.Instance.actLimitChargeId > 0)
+            {
+                Timers.inst.Add(1, 0, UpdateTime);
+            }
         }
 
         protected override void OnHide()
         {
             _valueBarController.OnHide();
             base.OnHide();
+            Timers.inst.Remove(UpdateTime);
         }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            // EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
         }
-
+        private void UpdateTime(object param)
+        {
+            if (ActivityDataManager.Instance.actLimitChargeId > 0)
+            {
+                ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
+                long curTime = TimeHelper.ServerNow();
+                long endTime = TimeUtil.DateTimeToTimestamp(openCfg.endTime);
+                if (curTime < endTime)
+                {
+                    _ui.m_comList.m_btnLimitChargeAddUp.m_txtTime.text = string.Format("剩余时间:{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
+                }
+            }
+        }
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(DailyWelfareView).FullName);

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

@@ -189,7 +189,7 @@ namespace GFGGame
             MainDataManager.Instance.CanSwipe = false;
             GRoot.inst.touchable = false;
             _ui.m_loaGuidestudio.visible = true;
-            
+
             _ui.m_headBar.m_txtName.text = RoleDataManager.roleName;
             if (_sceneObject == null)
             {
@@ -644,18 +644,18 @@ namespace GFGGame
             var activityInfoByTypeList =
               ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB1);
 
-          var list = activityInfoByTypeList
-              .Where(a => a.endTime > TimeInfo.Instance.ServerNow()).ToList();
-          if (list.Count == 0)
-          {
-              PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-          }
-          else
-          {
-              ViewManager.Show<SpecialOfferGiftBoxView>();
-          }
-        }
-        
+            var list = activityInfoByTypeList
+                .Where(a => a.endTime > TimeInfo.Instance.ServerNow()).ToList();
+            if (list.Count == 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+            }
+            else
+            {
+                ViewManager.Show<SpecialOfferGiftBoxView>();
+            }
+        }
+
         //圆形
         private void OnClickBtnGiftBag2()
         {
@@ -673,7 +673,7 @@ namespace GFGGame
                 ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.XSLB2, this.viewData });
             }
         }
-        
+
         private void UpGiftBox1()
         {
             var activityInfoByTypeList =
@@ -690,7 +690,7 @@ namespace GFGGame
                 _ui.m_txtGiftBagTime1.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].endTime);
             }
         }
-        
+
         private void UpGiftBox2()
         {
             var activityInfoByTypeList =
@@ -815,7 +815,9 @@ namespace GFGGame
             // _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
             // || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
 
-            int actLimitChargeId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitChargeId);
+            List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
+            int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;
+            // int actLimitChargeId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitChargeId);
             _ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||
             FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyWelfareView).Name, false) && (
             FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySignView).Name, false) ||