活动补充提交

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoEntryUI.cs

@@ -8,17 +8,18 @@ namespace UI.ActivityGetYuanXiao
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GGraph m_bgEffect;
         public GGraph m_doubaoEffect;
+        public GGraph m_titleTextEffect;
         public GButton m_btnStart;
+        public GGraph m_startBtnEffect;
         public GTextField m_txtTime;
         public GGraph m_yuanXiaoEffect;
         public GButton m_btnTask;
         public GButton m_btnShop;
         public GGraph m_cloudEffect;
         public GList m_list;
-        public GGraph m_titleTextEffect;
         public GComponent m_valueBar;
+        public GGraph m_bgEffect;
         public GButton m_btnBack;
         public Transition m_t0;
         public Transition m_listShow;
@@ -70,17 +71,18 @@ namespace UI.ActivityGetYuanXiao
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_doubaoEffect = (GGraph)comp.GetChild("doubaoEffect");
+            m_titleTextEffect = (GGraph)comp.GetChild("titleTextEffect");
             m_btnStart = (GButton)comp.GetChild("btnStart");
+            m_startBtnEffect = (GGraph)comp.GetChild("startBtnEffect");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_yuanXiaoEffect = (GGraph)comp.GetChild("yuanXiaoEffect");
             m_btnTask = (GButton)comp.GetChild("btnTask");
             m_btnShop = (GButton)comp.GetChild("btnShop");
             m_cloudEffect = (GGraph)comp.GetChild("cloudEffect");
             m_list = (GList)comp.GetChild("list");
-            m_titleTextEffect = (GGraph)comp.GetChild("titleTextEffect");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_t0 = comp.GetTransition("t0");
             m_listShow = comp.GetTransition("listShow");
@@ -88,17 +90,18 @@ namespace UI.ActivityGetYuanXiao
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_bgEffect = null;
             m_doubaoEffect = null;
+            m_titleTextEffect = null;
             m_btnStart = null;
+            m_startBtnEffect = null;
             m_txtTime = null;
             m_yuanXiaoEffect = null;
             m_btnTask = null;
             m_btnShop = null;
             m_cloudEffect = null;
             m_list = null;
-            m_titleTextEffect = null;
             m_valueBar = null;
+            m_bgEffect = null;
             m_btnBack = null;
             m_t0 = null;
             m_listShow = null;

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoEntryView.cs

@@ -69,7 +69,7 @@ namespace GFGGame
             {
                 return;
             }
-
+            _ui.m_doubaoEffect.SetScale(1, 1);
             _ui.m_list.visible = true;
             _valueBarController.UpdateList(new List<int>() { ConstItemID.YUANXIAO_REWARD, ConstItemID.YUANXIAO_GAME_CONSUME });
             _ui.m_listShow.Play();
@@ -215,13 +215,13 @@ namespace GFGGame
 
         private void AddEffect()
         {
-            _effectUIDic.Add("YXJ_bg_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "YXJ_bg_tx"));
-            //_effectUIDic.Add("YXJ_Button", EffectUIPool.CreateEffectUI(_ui.m_startBtnEffect, "ui_Activity", "YXJ_Button"));
+            _effectUIDic.Add("YXJ_bg_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "CLFG_BG_TX/CLFG_BG_TX "));
+            _effectUIDic.Add("YXJ_Button", EffectUIPool.CreateEffectUI(_ui.m_startBtnEffect, "ui_Activity", "CLFG_Start_Button/CLFG_Start_Button"));
             //_effectUIDic.Add("YXJ_Middle", EffectUIPool.CreateEffectUI(_ui.m_yuanXiaoEffect, "ui_Activity", "YXJ_Middle"));
-            //_effectUIDic.Add("YXJ_Text", EffectUIPool.CreateEffectUI(_ui.m_titleTextEffect, "ui_Activity", "YXJ_Text"));
+            _effectUIDic.Add("YXJ_Text", EffectUIPool.CreateEffectUI(_ui.m_titleTextEffect, "ui_Activity", "CLFG_Text/CLFG_Text"));
             _effectUIDic.Add("YXJ_Open_Down", EffectUIPool.CreateEffectUI(_ui.m_cloudEffect, "ui_Activity", "YXJ_Open_Down"));
             //_effectUIDic.Add("YXJ_Open_Up", EffectUIPool.CreateEffectUI(_ui.m_leafEffect, "ui_Activity", "YXJ_Open_Up"));
-            //_effectUIDic.Add("RedPack_doubao_Loop_R", EffectUIPool.CreateEffectUI(_ui.m_doubaoEffect, "ui_Activity", "RedPack_doubao_Loop_R"));
+            _effectUIDic.Add("RedPack_doubao_Loop_R", EffectUIPool.CreateEffectUI(_ui.m_doubaoEffect, "ui_Activity", "CLFG_Mid_Anma/CLFG_Mid_Anma"));
         }
 
         private void AutoLocationCurLevel()

GameClient/Assets/Game/HotUpdate/Views/TurnTable/TurnTableView.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using ET;
 using System.Threading.Tasks;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace GFGGame
 {
@@ -14,6 +15,7 @@ namespace GFGGame
     {
         private UI_TurnTableUI _ui;
         private ValueBarController _valueBarController;
+        private int activityID;
         private int WaitTime;
         private float duratio;
         //这里固定旋转
@@ -91,7 +93,7 @@ namespace GFGGame
                 pointerList.Add(_ui.m_pointer2);
             }
             normalEndValue.Clear();
-            int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityDataManager.Instance.TurnTableActivityType);
+            activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityDataManager.Instance.TurnTableActivityType);
             int propID = TurntableLuckyBoxCfgArray.Instance.GetCfgByActivityId(activityID).CostID;
             int dropId = TurntableLuckyBoxCfgArray.Instance.GetCfgByActivityId(activityID).DropId;
             rewardItemList = DropOutCfgArray.Instance.GetCfgsByid(dropId);
@@ -101,10 +103,13 @@ namespace GFGGame
             UpdateView();
             UpdateRewardItem();
             UpdateReward();
+            UpdateTime(null);
+            Timers.inst.Add(1, 0, UpdateTime);
         }
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(UpdateTime);
             _ui.m_btnStartOne.touchable = true;
             _ui.m_btnStartThree.touchable = true;
             _valueBarController.OnHide();
@@ -134,19 +139,51 @@ namespace GFGGame
                 ActivityDataManager.Instance.TurnSpecialRewardList = null;
             }
         }
+        private void UpdateTime(object param = null)
+        {
+            //=====限时礼包倒计时
+            var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
+            if (activityInfoByTypeList.Count == 0)
+            {
+                Timers.inst.Remove(UpdateTime);
+                _ui.m_gift.visible = false;
+            }
+            else
+            {
+                _ui.m_giftTimeText.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), activityInfoByTypeList[0].EndTime);
+            }
+            //=====限时礼包倒计时END
+        }
         private void UpdateView()
         {
+            _ui.m_reward.target.scrollPane.SetPercX(GetRewardIndex(), false);
+            ActivityOpenCfg activiyCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
+            if (activiyCfg != null)
+            {
+                _ui.m_timeText.text = GetTImeText(activiyCfg.endTime);
+            }
             //还要判断是否已购买,和时间
+            var activityOpenCfgs = ActivityOpenCfgArray.Instance.GetCfg(activityID);
+            if(activityOpenCfgs.paramsArr.Length == 0)
+            {
+                return;
+            }
+            var shopCfgId = activityOpenCfgs.paramsArr[0];
+            var shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
+            var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
             var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
             if (activityInfoByTypeList.Count == 0)
             {
                 _ui.m_gift.visible = false;
             }
-            else
+            else if(remainBuyNum != 0)
             {
                 _ui.m_gift.visible = true;
             }
-            _ui.m_reward.target.scrollPane.SetPercX(GetRewardIndex(),false);
+            else
+            {
+                _ui.m_gift.visible = false;
+            }
         }
         //更新转盘上物品
         private void UpdateRewardItem()
@@ -415,5 +452,22 @@ namespace GFGGame
             }
             return 0;
         }
+        private string GetTImeText(string time)
+        {
+            string pattern = @"\[(.*?)\]"; 
+
+            // 创建一个Regex对象
+            Regex regex = new Regex(pattern);
+
+            // 匹配输入字符串中的所有内容
+            MatchCollection matches = Regex.Matches(time, pattern);
+            // 存储所有提取的内容
+            string TimeText = matches[0].Groups[1].Value;
+            for(int i = 1;i< matches.Count; i++)
+            {
+                TimeText += "-" + matches[i].Groups[1].Value;
+            }
+            return TimeText;
+        }
     }
 }