开服活动入口修改

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -28,6 +28,7 @@ namespace UI.Main
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
+        public UI_BtnModle2 m_btnOpenServerActivity;
         public UI_BtnModle2 m_btnActivityAfuGift;
         public UI_BtnModle2 m_btnWanShiLi;
         public UI_BtnModle m_btnFirstRecharge;
@@ -106,6 +107,7 @@ namespace UI.Main
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
             m_btnActivityAfuGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityAfuGift"));
             m_btnWanShiLi = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnWanShiLi"));
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
@@ -152,6 +154,8 @@ namespace UI.Main
             m_btnActivityDay7 = null;
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
+            m_btnOpenServerActivity.Dispose();
+            m_btnOpenServerActivity = null;
             m_btnActivityAfuGift.Dispose();
             m_btnActivityAfuGift = null;
             m_btnWanShiLi.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerActivityUI.cs

@@ -8,12 +8,15 @@ namespace UI.OpenServerActivity
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GButton m_btnNineZhouPool;
-        public GButton m_btnTenShu;
+        public GButton m_btnBack;
         public GButton m_btnAnswerTianmen;
         public GButton m_btnMingTong;
         public GButton m_btnHeaven;
-        public GButton m_btnBack;
+        public GButton m_btnNineZhouPool;
+        public GButton m_btnTenShu;
+        public GTextField m_txtDay;
+        public GTextField m_txtHour;
+        public GTextField m_txtMinute;
         public const string URL = "ui://b8ha2mnsdedg0";
         public const string PACKAGE_NAME = "OpenServerActivity";
         public const string RES_NAME = "OpenServerActivityUI";
@@ -62,22 +65,28 @@ namespace UI.OpenServerActivity
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnNineZhouPool = (GButton)comp.GetChild("btnNineZhouPool");
-            m_btnTenShu = (GButton)comp.GetChild("btnTenShu");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnAnswerTianmen = (GButton)comp.GetChild("btnAnswerTianmen");
             m_btnMingTong = (GButton)comp.GetChild("btnMingTong");
             m_btnHeaven = (GButton)comp.GetChild("btnHeaven");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnNineZhouPool = (GButton)comp.GetChild("btnNineZhouPool");
+            m_btnTenShu = (GButton)comp.GetChild("btnTenShu");
+            m_txtDay = (GTextField)comp.GetChild("txtDay");
+            m_txtHour = (GTextField)comp.GetChild("txtHour");
+            m_txtMinute = (GTextField)comp.GetChild("txtMinute");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_btnNineZhouPool = null;
-            m_btnTenShu = null;
+            m_btnBack = null;
             m_btnAnswerTianmen = null;
             m_btnMingTong = null;
             m_btnHeaven = null;
-            m_btnBack = null;
+            m_btnNineZhouPool = null;
+            m_btnTenShu = null;
+            m_txtDay = null;
+            m_txtHour = null;
+            m_txtMinute = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -171,6 +171,19 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 输入一段时间（毫秒），将时间转换成DD:HH:mm格式
+        /// </summary>
+        /// <param name="timeMsec"></param>
+        public static string FormattingTimeTo_DD_HH_mm(long timeMsec)
+        {
+            TimeSpan ts = new TimeSpan(0, 0, (int)(timeMsec / 1000));
+            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>
         /// 将时间戳转换成HH:mm格式
         /// </summary>

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

@@ -105,6 +105,7 @@ namespace GFGGame
             _ui.m_headBar.target.onClick.Add(OnClickHeadBar);
             _ui.m_btnDailyWelfare.target.onClick.Add(OnClickBtnDailyWelfare);
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
+            _ui.m_btnOpenServerActivity.target.onClick.Add(OnClickBtnOpenServerActivity);
             _ui.m_btnWanShiLi.target.onClick.Add(OnClickBtnWanShiLi);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
@@ -377,6 +378,11 @@ namespace GFGGame
 
         private void OnClickBtnActivityLuckyBox()
         {
+            ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
+        }
+
+        private void OnClickBtnOpenServerActivity()
+        {
             ViewManager.Show<OpenServerActivityView>();
         }
 
@@ -592,21 +598,21 @@ namespace GFGGame
 
         private void UpdateActLuckyBox()
         {
-            //int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
-            //_ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
-            //if (actLuckyBoxId > 0)
-            //{
-            //    if (actLuckyBoxId != ActivityDataManager.Instance.lastActLuckyBoxId)
-            //    {
-            //        ActivitySProxy.ReqGetTimeLimitLuckyBoxInfo(actLuckyBoxId).Coroutine();
-            //        ActivityDataManager.Instance.lastActLuckyBoxId = actLuckyBoxId;
-            //    }
-            //    ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
-            //    _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
-            //    _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_tb_" + activityOpenCfg.res;
-            //    long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
-            //    _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
-            //}
+            int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            _ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
+            if (actLuckyBoxId > 0)
+            {
+                if (actLuckyBoxId != ActivityDataManager.Instance.lastActLuckyBoxId)
+                {
+                    ActivitySProxy.ReqGetTimeLimitLuckyBoxInfo(actLuckyBoxId).Coroutine();
+                    ActivityDataManager.Instance.lastActLuckyBoxId = actLuckyBoxId;
+                }
+                ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
+                _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
+                _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_tb_" + activityOpenCfg.res;
+                long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
+                _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+            }
         }
 
         private void UpdateLimitedActvityState()
@@ -801,7 +807,8 @@ namespace GFGGame
             _ui.m_btnCiPai.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             _ui.m_btnZhaiXing.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
             _ui.m_btnMain.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
-            //_ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox) > 0;
+            _ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox) > 0;
+            _ui.m_btnOpenServerActivity.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc) > 0;
             List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
             int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;
             _ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs

@@ -10,8 +10,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-     
-
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -45,7 +43,6 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-        
         }
 
         protected override void OnShown()
@@ -53,18 +50,35 @@ namespace GFGGame
             base.OnShown();
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("kfhd_sdcy_bg");
 
+            RefreshTimeText();
 
+            Timers.inst.Add(1, 0, UpdateTime);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(UpdateTime);
         }
-       
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-           
+        }
+
+        private void UpdateTime(object param)
+        {
+            RefreshTimeText();
+        }
+
+        private void RefreshTimeText()
+        {
+            int time = 1000000;
+            string strTime = TimeUtil.FormattingTimeTo_DD_HH_mm(time);
+            string[] str = strTime.Split(':');
+            _ui.m_txtDay.text = str[0];
+            _ui.m_txtHour.text = str[1];
+            _ui.m_txtMinute.text = str[2];
         }
 
         private void OnClickBtnBack()
@@ -81,12 +95,14 @@ namespace GFGGame
 
         private void OnClickBtnMingTong()
         {
+            //副本入口
             PromptController.Instance.ShowFloatTextPrompt("暂未开启");
             //ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
         }
 
         private void OnClickBtnAnswerTianmen()
         {
+            //剧情入口
             PromptController.Instance.ShowFloatTextPrompt("暂未开启");
             //ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
         }
@@ -104,7 +120,7 @@ namespace GFGGame
 
         private void OnClickBtnNineZhouPool() 
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_ARENA, ConstStoreSubId.STORE_ARENA_ITEM });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
         }
     }
 }