Эх сурвалжийг харах

添加主界面中豆包私藏的红点/更新时间
添加创建角色时,剧情等待

leiyasi 1 жил өмнө
parent
commit
33dbb02ba1

+ 38 - 0
GameClient/Assets/Game/HotUpdate/Data/LimitedRechargeDBGiftDataManager.cs

@@ -0,0 +1,38 @@
+using ET;
+using GFGGame;
+using System.Collections;
+using UnityEngine;
+
+namespace Assets.Game.HotUpdate.Data
+{
+    public class LimitedRechargeDBGiftDataManager : SingletonBase<LimitedRechargeDBGiftDataManager>
+    {
+        public bool CanGetReward()
+        {
+            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            if (_activityInfo == null) return false;
+            ActivityRecharge2Cfg[] _rechargeCfgs = ActivityRecharge2CfgArray.Instance.dataArray;
+            for (int i = 0; i < _rechargeCfgs.Length; i++)
+            {
+                if (_activityInfo.CountValue >= _rechargeCfgs[i].value && _activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) < 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public bool CheckOpen()
+        {
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
+                   activityInfo.EndTime > TimeHelper.ServerNow();
+        }
+
+        public long GetEndTime()
+        {
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            return activityInfo.EndTime;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Data/LimitedRechargeDBGiftDataManager.cs.meta

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

+ 6 - 0
GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Assets.Game.HotUpdate.Data;
 using ET;
 using Hutool;
 
@@ -902,5 +903,10 @@ namespace GFGGame
 
             return false;
         }
+
+        public bool GetLimitedRechargeDBGiftRed()
+        {
+            return LimitedRechargeDBGiftDataManager.Instance.CanGetReward();
+        }
     }
 }

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Data/StoryDialogDataManager.cs

@@ -15,12 +15,14 @@ namespace GFGGame
         private bool _waitPicFade = false;
         private bool _waitBgChange = false;
         private float _dialogShowDelay = 0.0f;
+        private bool _waiting = false;
 
         // Dialog wait pic's animation finished 
         public bool waitPicFade { get { return _waitPicFade; } set { _waitPicFade = value; } }
         public bool waitBgChange { get { return _waitBgChange; } set { _waitBgChange = value; } }
         public float dialogShowDelay { get { return _dialogShowDelay; } set { _dialogShowDelay = value; } }
 
+        public bool waiting { get { return _waiting; } set { _waiting = value; } }
     }
 }
 

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComProBonus2.cs

@@ -8,7 +8,7 @@ namespace UI.DailyWelfare
     {
         public GComponent target;
         public GLoader m_loaIcon;
-        public GTextField m_txtDay;
+        public GTextField m_count;
         public GImage m_imgGot;
         public const string URL = "ui://t8nwuj7ievdh27";
         public const string PACKAGE_NAME = "DailyWelfare";
@@ -58,13 +58,13 @@ namespace UI.DailyWelfare
         private void Init(GComponent comp)
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtDay = (GTextField)comp.GetChild("txtDay");
+            m_count = (GTextField)comp.GetChild("count");
             m_imgGot = (GImage)comp.GetChild("imgGot");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
-            m_txtDay = null;
+            m_count = null;
             m_imgGot = null;
             if(disposeTarget && target != null)
             {

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DBGiftItem.cs

@@ -7,6 +7,7 @@ namespace UI.DailyWelfare
     public partial class UI_DBGiftItem
     {
         public GComponent target;
+        public GLoader m_DBB;
         public GLoader m_loaIcon;
         public const string URL = "ui://t8nwuj7ievdh28";
         public const string PACKAGE_NAME = "DailyWelfare";
@@ -55,10 +56,12 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
+            m_DBB = (GLoader)comp.GetChild("DBB");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_DBB = null;
             m_loaIcon = null;
             if(disposeTarget && target != null)
             {

+ 6 - 12
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_GiftDetailUI.cs

@@ -9,10 +9,8 @@ namespace UI.DailyWelfare
         public GComponent target;
         public Controller m_c1;
         public GComponent m_bg;
-        public GTextField m_txtLock;
-        public GTextField m_txtWeekGiftBag;
-        public GList m_listWeekGiftBag;
-        public GButton m_btnGetWeekGiftBag;
+        public GList m_listGiftBag;
+        public GButton m_btnCheck;
         public const string URL = "ui://t8nwuj7ievdh2a";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "GiftDetailUI";
@@ -62,19 +60,15 @@ namespace UI.DailyWelfare
         {
             m_c1 = comp.GetController("c1");
             m_bg = (GComponent)comp.GetChild("bg");
-            m_txtLock = (GTextField)comp.GetChild("txtLock");
-            m_txtWeekGiftBag = (GTextField)comp.GetChild("txtWeekGiftBag");
-            m_listWeekGiftBag = (GList)comp.GetChild("listWeekGiftBag");
-            m_btnGetWeekGiftBag = (GButton)comp.GetChild("btnGetWeekGiftBag");
+            m_listGiftBag = (GList)comp.GetChild("listGiftBag");
+            m_btnCheck = (GButton)comp.GetChild("btnCheck");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_bg = null;
-            m_txtLock = null;
-            m_txtWeekGiftBag = null;
-            m_listWeekGiftBag = null;
-            m_btnGetWeekGiftBag = null;
+            m_listGiftBag = null;
+            m_btnCheck = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_LimitedRechargeDBGiftUI.cs

@@ -7,11 +7,13 @@ namespace UI.DailyWelfare
     public partial class UI_LimitedRechargeDBGiftUI
     {
         public GComponent target;
+        public GComponent m_bg;
         public UI_ProgressBar2 m_progress;
         public UI_DBGiftItem m_DBGiftItem1;
         public UI_DBGiftItem m_DBGiftItem2;
         public UI_DBGiftItem m_DBGiftItem3;
         public UI_DBGiftItem m_DBGiftItem4;
+        public GGroup m_DBGiftItemGroup;
         public GTextField m_txtTime;
         public GGroup m_grpTime;
         public GButton m_btnTest;
@@ -62,17 +64,20 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
+            m_bg = (GComponent)comp.GetChild("bg");
             m_progress = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progress"));
             m_DBGiftItem1 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem1"));
             m_DBGiftItem2 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem2"));
             m_DBGiftItem3 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem3"));
             m_DBGiftItem4 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem4"));
+            m_DBGiftItemGroup = (GGroup)comp.GetChild("DBGiftItemGroup");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
             m_btnTest = (GButton)comp.GetChild("btnTest");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
             m_progress.Dispose();
             m_progress = null;
             m_DBGiftItem1.Dispose();
@@ -83,6 +88,7 @@ namespace UI.DailyWelfare
             m_DBGiftItem3 = null;
             m_DBGiftItem4.Dispose();
             m_DBGiftItem4 = null;
+            m_DBGiftItemGroup = null;
             m_txtTime = null;
             m_grpTime = null;
             m_btnTest = null;

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs

@@ -97,6 +97,7 @@ namespace GFGGame
                     _ui.m_t_AfterOpen.Play(()=>
                     {
                         this.Hide();
+                        StoryDialogDataManager.Instance.waiting = false;
                     });
                     break;
             }

+ 60 - 4
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/GiftDetailView.cs

@@ -1,10 +1,66 @@
-using System.Collections;
-using UnityEngine;
+using System.Threading.Tasks;
+using ET;
+using FairyGUI;
+using UI.DailyWelfare;
 
-namespace Assets.Game.HotUpdate.Views.DailyWelfare
+namespace GFGGame
 {
-    public class GiftDetailView : MonoBehaviour
+    public class GiftDetailView : BaseWindow
     {
+        private UI_GiftDetailUI _ui;
 
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_GiftDetailUI.PACKAGE_NAME;
+            _ui = UI_GiftDetailUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            _ui.m_listGiftBag.itemRenderer = ListRewardItemRender;
+            _ui.m_btnCheck.onClick.Add(OnBtnCheckClick);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            int id = (int)viewData;
+            ActivityRecharge2Cfg _rechargeCfgs = ActivityRecharge2CfgArray.Instance.GetCfg(id);
+            _ui.m_listGiftBag.data = _rechargeCfgs.bonusArr;
+            _ui.m_listGiftBag.numItems = _rechargeCfgs.bonusArr.Length;
+            _ui.m_listGiftBag.scrollPane.ScrollTop();
+        }
+
+        private void ListRewardItemRender(int index, GObject obj)
+        {
+            int[][] rewards = (int[][])obj.parent.data;
+
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            ItemData itemData = ItemUtil.createItemData(rewards[index]);
+            (obj.data as ItemView).SetData(itemData);
+            (obj.data as ItemView).ChangeTxtCountStyle();
+        }
+
+        private void OnBtnCheckClick(EventContext context)
+        {
+            ViewManager.Hide<GiftDetailView>();
+        }
     }
 }

+ 64 - 27
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitedRechargeDBGiftView.cs

@@ -36,7 +36,7 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _ui.m_btnTest.onClick.Add(OnClickBtnTest);
+            _ui.m_btnTest.onClick.Add(OnBtnTestClick);
             _rechargeCfgs = ActivityRecharge2CfgArray.Instance.dataArray;
             InitProgressValueList();
             InitReward();
@@ -46,7 +46,6 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_REWARD_ADD, UpdateView);
-            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateView);
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_COUNT_VALUE_CHANGE, UpdateView);
         }
 
@@ -54,7 +53,6 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_REWARD_ADD, UpdateView);
-            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_COUNT_VALUE_CHANGE, UpdateView);
         }
 
@@ -63,7 +61,7 @@ namespace GFGGame
             base.OnShown();
 
             UpdateView();
-            UpdateProgress();
+            UpdateTime(null);
             Timers.inst.Add(1, 0, UpdateTime);
         }
 
@@ -73,7 +71,7 @@ namespace GFGGame
             Timers.inst.Remove(UpdateTime);
         }
 
-        private void OnClickBtnTest(EventContext context)
+        private void OnBtnTestClick(EventContext context)
         {
             UpdateProgress();
         }
@@ -82,6 +80,9 @@ namespace GFGGame
         private int[] _progressValuePart;
         private int _partNum = 4;
 
+        /// <summary>
+        /// 计算奖励的分段列表
+        /// </summary>
         private void InitProgressValueList()
         {
             _progressValuePart = new int[_partNum];
@@ -102,25 +103,40 @@ namespace GFGGame
         /// </summary>
         private void InitReward()
         {
-            // 包子图
-
-            // 大奖icon
+            for (int i = 0; i < _partNum; i++)
+            {
+                GObject gift = _ui.target.GetChild("DBGiftItem" + (i + 1));
+                UI_DBGiftItem item = UI_DBGiftItem.Proxy(gift);
+                // 大奖icon
+                item.m_loaIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(_rechargeCfgs[i].bonusArr[0][0]));
+                // 包子图
+                item.m_DBB.url = "ui://DailyWelfare/DBB_" + (i + 1);
+                gift.data = _rechargeCfgs[i].bonusArr[0][0];
+                gift.onClick.Add(OnRewardIconClick);
+                UI_DBGiftItem.ProxyEnd();
 
+                // 进度条分段值Text
+                GObject progressItem = _ui.m_progress.target.GetChild("comProBonus" + i);
+                UI_ComProBonus2 bonus = UI_ComProBonus2.Proxy(progressItem);
+                bonus.m_count.text = _rechargeCfgs[i].value.ToString();
+                UI_ComProBonus2.ProxyEnd();
+            }
         }
 
         private void UpdateProgress()
         {
             int max = (int)_ui.m_progress.target.max;
             long count = _activityInfo.CountValue;
+            int index = 1;
 
             // 确定count的区间
-            if (count == 0 || count == max)
+            if (count == 0 || count >= max)
             {
-                _ui.m_progress.target.value = count;
+                _ui.m_progress.target.value = Mathf.Min(count, max);
+                index = (count == 0 ? 0 : _partNum - 1);
             }
             else
             {
-                int index = 1;
                 for (; index < _progressValuePart.Length; index++)
                 {
                     if (count < _progressValuePart[index])
@@ -142,10 +158,9 @@ namespace GFGGame
                 {
                     _ui.m_progress.target.value = Mathf.Clamp(count, minProgressValue, maxProgressValue);
                 }
-
-                // 检测玩家是否领取奖励
-                UpdateRewardState(index);
             }
+            // 检测玩家是否领取奖励
+            UpdateRewardState(index);
         }
 
         private void UpdateTime(object param)
@@ -163,24 +178,24 @@ namespace GFGGame
 
         private struct GetState
         {
-            public int index;
+            public int rewardID;
             public bool canGet;
         }
+
         /// <summary>
-        /// 
+        /// 更新奖励状态
         /// </summary>
         /// <param name="index">玩家可领取的最大奖励index</param>
         private void UpdateRewardState(int index)
         {
-            GComponent comProBonusGroup = _ui.m_progress.m_comProBonusGroup.asCom;
-
             for(int i = 0; i < _partNum; i++)
             {
                 bool arrive = (i <= index);
-                UI_ComProBonus2 bonus = UI_ComProBonus2.Proxy(comProBonusGroup.GetChildAt(i));
+                GObject progressItem = _ui.m_progress.target.GetChild("comProBonus" + i);
+                UI_ComProBonus2 bonus = UI_ComProBonus2.Proxy(progressItem);
                 bonus.target.data = new GetState
                 {
-                    index = i,
+                    rewardID = _rechargeCfgs[i].id,
                     canGet = arrive
                 };
 
@@ -188,7 +203,7 @@ namespace GFGGame
                 if (arrive)
                 {
                     // 已领
-                    if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) > 0)
+                    if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) >= 0)
                     {
                         bonus.m_imgGot.visible = true;
                         bonus.target.touchable = false;
@@ -203,26 +218,48 @@ namespace GFGGame
                         RedDotController.Instance.SetComRedDot(bonus.target, true);
                     }
                 }
-                bonus.target.onClick.Set(OnClickGift);
+                progressItem.onClick.Set(OnGiftClick);
                 UI_ComProBonus2.ProxyEnd();
             }
         }
 
-        private void OnClickGift(EventContext eventContext)
+        /// <summary>
+        /// 点击最下方的礼物icon
+        /// </summary>
+        /// <param name="eventContext"></param>
+        private void OnGiftClick(EventContext eventContext)
         {
-            GObject gObject = (GObject)eventContext.data;
-            GetState getState = (GetState)gObject.data;
+            GObject gObject = eventContext.sender as GObject;
+            GetState getState = (GetState)(gObject.data);
 
             if (getState.canGet)
             {
-                ActivityGlobalSProxy.ReqGetActivityBonus(_activityInfo.ActivityId, _rechargeCfgs[getState.index].id).Coroutine();
+                ActivityGlobalSProxy.ReqGetActivityBonus(_activityInfo.ActivityId, getState.rewardID).Coroutine();
             }
             else
             {
                 // 显示奖励详细列表
-                //ViewManager.Show<UI_GiftDetailUI>
+                ViewManager.Show<GiftDetailView>(getState.rewardID, ViewManager.GetGoBackDatas(typeof(LimitedRechargeDBGiftView).FullName));
             }
         }
+
+        /// <summary>
+        /// 点击上方的奖励icon,显示单个奖励介绍(奖励配置中的第一个奖励)
+        /// </summary>
+        /// <param name="eventContext"></param>
+        private void OnRewardIconClick(EventContext eventContext)
+        {
+            GObject gObject = eventContext.sender as GObject;
+            int id = (int)(gObject.data);
+            GoodsItemTipsController.ShowItemTips(id);
+        }
+
+        public bool CheckOpen()
+        {
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
+                   activityInfo.EndTime > TimeHelper.ServerNow();
+        }
     }
 
 }

+ 10 - 7
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -370,7 +370,7 @@ namespace GFGGame
             }
             else
             {
-                ShowDialog(storyDialogCfg);
+                Timers.inst.StartCoroutine(ShowDialog(storyDialogCfg));
             }
         }
 
@@ -403,17 +403,24 @@ namespace GFGGame
             _ui.m_list.visible = false;
         }
 
-        private void ShowDialog(StoryDialogCfg storyDialogCfg)
+        private IEnumerator ShowDialog(StoryDialogCfg storyDialogCfg)
         {
             if (storyDialogCfg.showChangeName == 1 && StorageDataManager.Instance.GetStorageValue(ConstStorageId.CHANGE_NAME) == 0)
             {
+                GameController.ShowCreateRole();
+                StoryDialogDataManager.Instance.waiting = true;
+                while (StoryDialogDataManager.Instance.waiting)
+                {
+                    yield return new WaitForEndOfFrame();
+                }
+
                 if (_autoPlay)
                 {
                     _ui.m_btnAutoPlay.selected = false;
                     OnClickBtnAutoPlay();
                 }
-                GameController.ShowCreateRole();
             }
+
             _ui.m_loaMask.url = ResPathUtil.GetBgImgPath(storyDialogCfg.maskRes);
             _ui.m_btnAutoPlay.enabled = true;
             _ui.m_list.visible = false;
@@ -524,10 +531,6 @@ namespace GFGGame
                 if (!lastTextFieldType.Equals("name"))
                 {
                     lastTextFieldType = "name";
-                    //if(IsTeaParty)
-                    //    _ui.m_t1.Play();
-                    //else
-                    //    _ui.m_t0.Play();
                     _ui.m_t0.Play();
                 }
             }

+ 24 - 6
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -7,6 +7,7 @@ using System;
 using System.Linq;
 using Hutool;
 using UI.CommonGame;
+using Assets.Game.HotUpdate.Data;
 
 namespace GFGGame
 {
@@ -784,20 +785,35 @@ namespace GFGGame
                 ActivityDataManager.Instance.AllSevenDayBonusGot()));
             }
 
+            UpdateLimitedActvityState();
+            UpdateTime();
+
+            //特惠礼包/限时礼包窗口内的倒计时
+            UpGiftBox1();
+            UpGiftBox2();
+            EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_TIME);
+        }
+
+        private void UpdateLimitedActvityState()
+        {
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
+            //_ui.m_btnLimitedRechargeDBGift.target.visible = LimitedRechargeDBGiftDataManager.Instance.CheckOpen();
+            _ui.m_btnLimitedRechargeDBGift.target.visible = false;
+        }
 
+        private void UpdateTime()
+        {
             if (_ui.m_btnActivityDay7.target.visible)
             {
                 long time = ActivityDay7DataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
                 _ui.m_btnActivityDay7.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
-
             }
 
-
-            //特惠礼包/限时礼包窗口内的倒计时
-            UpGiftBox1();
-            UpGiftBox2();
-            EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_TIME);
+            if (_ui.m_btnLimitedRechargeDBGift.target.visible)
+            {
+                long time = LimitedRechargeDBGiftDataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
+                _ui.m_btnLimitedRechargeDBGift.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+            }
         }
 
         private void ShowExitAlert()
@@ -975,6 +991,8 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", 9, -1);
             RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed(), "", -8);
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnLimitedRechargeDBGift.target, RedDotDataManager.Instance.GetLimitedRechargeDBGiftRed());
+
 
             RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "", -10, 20);
             RedDotController.Instance.SetComRedDot(_ui.m_btnCiPai.target, RedDotDataManager.Instance.GetCardRed(), "", -10, 20);

BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0.png


BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes