添加阿福赠礼逻辑

GameClient/Assets/Game/HotUpdate/Data/ActivityAfuGiftDataManager.cs

@@ -8,69 +8,104 @@ namespace GFGGame
     public class ActivityAfuGiftDataManager : SingletonBase<ActivityAfuGiftDataManager>
     {
         private ActivityInfo info;
+        public ActivityInfo Info { get => info; set => info = value; }
+
+        private int _indexDay;
         private bool _isBuy;
         //已经领奖levelId
-        private HashSet<int> _normalRewards = new HashSet<int>();
+        private List<int> _normalRewards = new List<int>();
 
         //已经高级领奖levelId
-        private HashSet<int> _superRewards = new HashSet<int>();
+        private List<int> _superRewards = new List<int>();
         private List<ActivityLoginCfg> _rewardCfgs;
 
         public List<ActivityLoginCfg> RewardCfgs { get => _rewardCfgs; set => _rewardCfgs = value; }
-        public ActivityInfo Info { get => info; set => info = value; }
+
+        private List<ItemData> _getRewardList = new List<ItemData>();
+        public List<ItemData> GetRewardList { get => _getRewardList; set => _getRewardList = value; }
+
 
         public void InitActivityInfo()
         {
             Info = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
             RewardCfgs = ActivityLoginCfgArray.Instance.GetCfgsByid(Info.ActivityId);
         }
-         
-        public int GetActivityDay(int activityID)
+
+        public long GetEndTime()
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(activityID);
-            return activityInfo == null ? 0 : TimeUtil.GetDay5(activityInfo.StartTime);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
+            return activityInfo.EndTime;
         }
 
-        public int GetMaxPassDay()
+        public int GetNormalRewardStateByDay(int indexDay)
         {
-            int rewardDay = ActivityLoginCfgArray.Instance.GetCfgsByid(Info.ActivityId).Count;
-            return Math.Min(rewardDay, GetActivityDay(Info.ActivityId));
+            return _normalRewards[indexDay];
         }
 
-        public long GetEndTime()
+        public int GetSuperRewardStateByDay(int indexDay)
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
-            return activityInfo.EndTime;
+            return _superRewards[indexDay];
+        }
+
+        public void SetRewardStateList(List<int> list, bool isVip)
+        {
+            if (isVip)
+            {
+                _superRewards = new List<int>(list);
+            }
+            else
+            {
+                _normalRewards = new List<int>(list);
+            }
         }
 
-        public bool CanGetNormalReward(int id)
+        public void SetIsBuy(bool isBuy)
         {
-            return !_normalRewards.Contains(id);
+            _isBuy = isBuy;
         }
 
-        public bool CanGetSuperReward(int id)
+        public bool GetIsBuy()
         {
-            return _isBuy && !_superRewards.Contains(id);
+            return _isBuy;
         }
 
-        public void AddNormalReward(int levelId)
+        public void SetIndexDay(int indexDay)
         {
-            _normalRewards.Add(levelId);
+            _indexDay = indexDay;
         }
 
-        public void AddSuperReward(int levelId)
+        public int GetIndexDay()
         {
-            _superRewards.Add(levelId);
+            return _indexDay;
         }
 
-        public void SetIsBuy(bool isBuy)
+        public void AddGetReward(List<ItemData> data)
         {
-            _isBuy = isBuy;
+            foreach (var t in data)
+            {
+                GetRewardList.Add(t);
+            }
         }
 
-        public bool GetIsBuy()
+        public void ClearGetReward()
         {
-            return _isBuy;
+            GetRewardList.Clear();
+        }
+
+        public bool HaveCanGetReward()
+        {
+            int passDay = GetIndexDay();
+
+            for (int i = passDay - 1; i >= 0; i--)
+            {
+                if (GetNormalRewardStateByDay(i) == ConstBonusStatus.CAN_GET 
+                    || GetSuperRewardStateByDay(i) == ConstBonusStatus.CAN_GET)
+                {
+                    return true;
+                }
+            }
+
+            return false;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAFuGift/UI_ActivityAFuGiftUI.cs

@@ -8,6 +8,7 @@ namespace UI.ActivityAFuGift
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_btnGetState;
         public UI_Panel m_panel;
         public GButton m_btnGet;
         public GButton m_btnClose;
@@ -60,6 +61,7 @@ namespace UI.ActivityAFuGift
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_btnGetState = comp.GetController("btnGetState");
             m_panel = (UI_Panel)UI_Panel.Create(comp.GetChild("panel"));
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_btnClose = (GButton)comp.GetChild("btnClose");
@@ -68,6 +70,7 @@ namespace UI.ActivityAFuGift
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_btnGetState = null;
             m_panel.Dispose();
             m_panel = null;
             m_btnGet = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs

@@ -31,6 +31,7 @@ namespace UI.CommonGame
         public GImage m_imgShowTong;
         public GGroup m_grpGot;
         public GImage m_lock;
+        public GImage m_mask;
         public const string URL = "ui://eg2y0ldpwet2tae";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComItem";
@@ -102,6 +103,7 @@ namespace UI.CommonGame
             m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
             m_grpGot = (GGroup)comp.GetChild("grpGot");
             m_lock = (GImage)comp.GetChild("lock");
+            m_mask = (GImage)comp.GetChild("mask");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -129,6 +131,7 @@ namespace UI.CommonGame
             m_imgShowTong = null;
             m_grpGot = null;
             m_lock = null;
+            m_mask = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityAfuGiftProxy.cs

@@ -12,14 +12,10 @@ namespace ET
             var info =  message.ActivityLoginInfo;
             var afuGiftDataManager = ActivityAfuGiftDataManager.Instance;
             afuGiftDataManager.SetIsBuy(info.IsBuy);
-            foreach (var rewardID in info.FreeRewardStatusList)
-            {
-                afuGiftDataManager.AddNormalReward(rewardID);
-            }
-            foreach (var superRewardID in info.PayRewardStatusList)
-            {
-                afuGiftDataManager.AddSuperReward(superRewardID);
-            }
+
+            afuGiftDataManager.SetRewardStateList(info.FreeRewardStatusList, false);
+            afuGiftDataManager.SetRewardStateList(info.PayRewardStatusList, true);
+
             //EventAgent.DispatchEvent(ConstMessage.NOTICE_PASSPORT_OPEN);
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             await ETTask.CompletedTask;
@@ -39,14 +35,11 @@ namespace GFGGame
             var info = response.ActivityLoginInfo;
             var activityAfuGiftDataManager = ActivityAfuGiftDataManager.Instance;
             activityAfuGiftDataManager.SetIsBuy(info.IsBuy);
-            foreach(var t in info.FreeRewardStatusList)
-            {
-                activityAfuGiftDataManager.AddNormalReward(t);
-            }
-            foreach (var t in info.PayRewardStatusList)
-            {
-                activityAfuGiftDataManager.AddSuperReward(t);
-            }
+            activityAfuGiftDataManager.SetIndexDay(info.IndexDay);
+
+            activityAfuGiftDataManager.SetRewardStateList(info.FreeRewardStatusList, false);
+            activityAfuGiftDataManager.SetRewardStateList(info.PayRewardStatusList, true);
+
         }
 
         public static async ETTask<bool> ReqGetReward(bool isPay, int rewardDay)
@@ -55,18 +48,13 @@ namespace GFGGame
                 (S2C_GetActivityLoginReward)await MessageHelper.SendToServer(new C2S_GetActivityLoginReward()
                 { IsPay = isPay, RewardDay = rewardDay });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
-            //奖励弹窗
-            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+
             var info = response.ActivityLoginInfo;
             var activityAfuGiftDataManager = ActivityAfuGiftDataManager.Instance;
-            foreach (var t in info.FreeRewardStatusList)
-            {
-                activityAfuGiftDataManager.AddNormalReward(t);
-            }
-            foreach (var t in info.PayRewardStatusList)
-            {
-                activityAfuGiftDataManager.AddSuperReward(t);
-            }
+            activityAfuGiftDataManager.AddGetReward(ItemUtil.CreateItemDataList(response.BonusList));
+
+            activityAfuGiftDataManager.SetRewardStateList(info.FreeRewardStatusList, false);
+            activityAfuGiftDataManager.SetRewardStateList(info.PayRewardStatusList, true);
 
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             return false;

GameClient/Assets/Game/HotUpdate/Views/ActivityAfuGift/ActivityAfuGiftView.cs

@@ -6,6 +6,7 @@ using FairyGUI;
 using System;
 using UI.CommonGame;
 using static GFGGame.ShopSProxy;
+using System.Threading.Tasks;
 
 namespace GFGGame
 {
@@ -16,8 +17,7 @@ namespace GFGGame
         private struct GetState
         {
             public int rewardID;
-            public int dayIndex;
-            public bool canGet; 
+            public bool canGet;
             public bool isVip;
         }
 
@@ -42,7 +42,7 @@ namespace GFGGame
 
             // Data
             ActivityAfuGiftDataManager.Instance.InitActivityInfo();
-            
+
             // UI
             _rewardListUI = _ui.m_panel.m_scrollPane.m_list;
             _rewardListUI.itemRenderer = RenderListReward;
@@ -53,10 +53,10 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
-            _ui.m_panel.m_scrollPane.target.scrollPane.posX = 0;
+            ProgressAutoLocate();
             UpdateTime(null);
             Timers.inst.Add(1, 0, UpdateTime);
+            UpdateButtonState();
         }
 
         protected override void OnHide()
@@ -95,6 +95,18 @@ namespace GFGGame
             float marginLeft = 149;
             GProgressBar gProgressBar = _ui.m_panel.m_scrollPane.m_progress;
             gProgressBar.width = marginLeft + _rewardListUI.GetChildAt(_rewardListUI.numChildren - 1).position.x - _rewardListUI.GetChildAt(0).position.x;
+            // 初始化进度条值
+            int indexDay = ActivityAfuGiftDataManager.Instance.GetIndexDay();
+            gProgressBar.value = CalculateProgressCount(indexDay, _rewardListUI.numChildren);
+        }
+
+        /// <summary>
+        /// 滚动到最新日期
+        /// </summary>
+        private void ProgressAutoLocate()
+        {
+            _ui.m_panel.m_scrollPane.target.scrollPane.posX 
+                = (ActivityAfuGiftDataManager.Instance.GetIndexDay() - 1) * (_rewardListUI.GetChildAt(0).width + _rewardListUI.columnGap);
         }
 
         private float CalculateListWidth(int num, float itemWidth, float columnGap)
@@ -102,6 +114,21 @@ namespace GFGGame
             return num * itemWidth + (num - 1) * columnGap;
         }
 
+        private double CalculateProgressCount(int indexDay, int sumDay)
+        {
+            int defaultLen = 18;
+            if (indexDay == sumDay)
+            {
+                return 100;
+            }
+            if (indexDay == 1)
+            {
+                return defaultLen;
+            }
+
+            return defaultLen + (100 - defaultLen) / (sumDay - 1) * (indexDay - 1);
+        }
+
         private void UpdateTime(object param)
         {
             long curTime = TimeHelper.ServerNow();
@@ -111,13 +138,17 @@ namespace GFGGame
 
         private void RenderListReward(int index, GObject item)
         {
+            item.data = index;
+            UI_reward.ProxyEnd();
             UI_reward rewardUI = UI_reward.Proxy(item);
             rewardUI.m_day.m_day.SetVar("day", (index + 1).ToString()).FlushVars();
 
             // 已经到达的日期
-            int passDay = ActivityAfuGiftDataManager.Instance.GetMaxPassDay();
+            int passDay = ActivityAfuGiftDataManager.Instance.GetIndexDay();
             int arrive = (index + 1) <= passDay ? 0 : 1;
             rewardUI.m_day.m_light.SetSelectedIndex(arrive);
+            // 当日高亮
+            rewardUI.m_c1.SetSelectedIndex((index + 1) == passDay ? 1 : 0);
 
             int itemNormalId = ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusFreeArr[0][0];
             int itemVipId1 = ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[0][0];
@@ -125,68 +156,81 @@ namespace GFGGame
 
             LoadItem(itemNormalId, rewardUI.m_reward_normal, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusFreeArr[0][1]);
             LoadItem(itemVipId1, rewardUI.m_reward_vip1, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[0][1], true);
-            LoadItem(itemVipId2, rewardUI.m_reward_vip2, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[1][1], true);
-
-            UI_reward.ProxyEnd();
+            LoadItem(itemVipId2, rewardUI.m_reward_vip2, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[1][1], true, true);
         }
 
-        private void LoadItem(int id, GObject obj, int num, bool isVip = false)
+        private void LoadItem(int itemID, GObject obj, int num, bool isVip = false, bool release = false)
         {
-            ItemCfg itemNormal = ItemCfgArray.Instance.GetCfg(id);
+            ItemCfg itemNormal = ItemCfgArray.Instance.GetCfg(itemID);
             UI_ComItem comItem = UI_ComItem.Proxy(obj);
+
             comItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemNormal);
             comItem.m_txtCount.text = num.ToString();
             comItem.m_QualityType.selectedIndex = itemNormal.rarity - 1;
             comItem.target.onClick.Add(OnItemClick);
 
-            int isLock = 0;
+            int dayIndex = (int)obj.parent.data + 1;
+            // 已经到达的日期
+            int passDay = ActivityAfuGiftDataManager.Instance.GetIndexDay();
+            bool arrive = dayIndex <= passDay;
+
             if (isVip)
             {
-                isLock = ActivityAfuGiftDataManager.Instance.GetIsBuy() ? 0 : 1;
+                if (ActivityAfuGiftDataManager.Instance.GetIsBuy())
+                {
+                    comItem.m_Lock.SetSelectedIndex(arrive ? 0 : 2);
+                }
+                else
+                {
+                    comItem.m_Lock.SetSelectedIndex(1);
+                }
             }
-            comItem.m_Lock.selectedIndex = isLock;
-
-            int dayIndex = _rewardListUI.GetChildIndex(obj) + 1;
-            // 已经到达的日期
-            int passDay = ActivityAfuGiftDataManager.Instance.GetMaxPassDay();
-            bool arrive = dayIndex <= passDay;
-            comItem.target.data = new GetState
+            else
             {
-                rewardID = id,
-                canGet = arrive,
-                dayIndex = dayIndex,
-                isVip = isVip
-            };
+                comItem.m_Lock.SetSelectedIndex(arrive ? 0 : 2);
+            }
+
+            bool canGet = false;
+            int getState;
             if (arrive)
             {
-                ActivityInfo activityInfo = ActivityAfuGiftDataManager.Instance.Info;
-                bool canGet = false;
                 // Vip专属
                 if (isVip)
                 {
-                    canGet = ActivityAfuGiftDataManager.Instance.CanGetSuperReward(dayIndex);
+                    getState = ActivityAfuGiftDataManager.Instance.GetSuperRewardStateByDay(dayIndex - 1);
                 }
                 else
                 {
-                    canGet = ActivityAfuGiftDataManager.Instance.CanGetNormalReward(dayIndex);
+                    getState = ActivityAfuGiftDataManager.Instance.GetNormalRewardStateByDay(dayIndex - 1);
                 }
-                // 已领
-                if (!canGet)
-                {
-                    //bonus.m_imgGot.visible = true;
-                    obj.touchable = false;
-                    // 隐藏红点
-                    RedDotController.Instance.SetComRedDot(obj.asCom, false);
-                }
-                // 未领
-                else
+
+                switch (getState)
                 {
-                    //bonus.m_imgGot.visible = false;
-                    // 显示红点
-                    RedDotController.Instance.SetComRedDot(obj.asCom, true);
+                    case ConstBonusStatus.CAN_NOT_GET:
+                        break;
+
+                    case ConstBonusStatus.CAN_GET:
+                        canGet = true;
+                        comItem.m_grpGot.visible = false;
+                        // 显示红点
+                        RedDotController.Instance.SetComRedDot(obj.asCom, true, "", -33, 27);
+                        break;
+
+                    case ConstBonusStatus.GOT:
+                        comItem.m_grpGot.visible = true;
+                        obj.touchable = false;
+                        // 隐藏红点
+                        RedDotController.Instance.SetComRedDot(obj.asCom, false);
+                        break;
                 }
-
             }
+
+            obj.data = new GetState
+            {
+                rewardID = itemID,
+                isVip = isVip,
+                canGet = canGet
+            };
             UI_ComItem.ProxyEnd();
         }
 
@@ -197,17 +241,7 @@ namespace GFGGame
 
             if (getState.canGet)
             {
-                // Vip奖励同时领取两个
-                if (getState.isVip)
-                {
-                    int rewardID1 = ActivityAfuGiftDataManager.Instance.RewardCfgs[getState.dayIndex - 1].bonusPayArr[0][1];
-                    int rewardID2 = ActivityAfuGiftDataManager.Instance.RewardCfgs[getState.dayIndex - 1].bonusPayArr[1][1];
-                }
-                else
-                {
-                    int ID = ActivityAfuGiftDataManager.Instance.RewardCfgs[getState.dayIndex - 1].bonusFreeArr[0][1];
-                }
-                //ActivityGlobalSProxy.ReqGetActivityBonus(_activityInfo.ActivityId, getState.rewardID).Coroutine();
+                GetReward(getState, (int)obj.parent.data + 1);
             }
             else
             {
@@ -215,6 +249,36 @@ namespace GFGGame
             }
         }
 
+        private async Task GetReward(GetState getState, int indexDay)
+        {
+            ActivityAfuGiftDataManager.Instance.ClearGetReward();
+            await ActivityAfuGiftProxy.ReqGetReward(getState.isVip, indexDay);
+            // 奖励弹窗
+            BonusController.TryShowBonusList(ActivityAfuGiftDataManager.Instance.GetRewardList);
+        }
+
+        private async Task GetAllReward()
+        {
+            int passDay = ActivityAfuGiftDataManager.Instance.GetIndexDay();
+            ActivityAfuGiftDataManager.Instance.ClearGetReward();
+
+            for (int i = passDay - 1; i >= 0; i--)
+            {
+                if (ActivityAfuGiftDataManager.Instance.GetNormalRewardStateByDay(i) == ConstBonusStatus.CAN_GET)
+                {
+                    await ActivityAfuGiftProxy.ReqGetReward(false, (i + 1));
+                }
+
+                if (ActivityAfuGiftDataManager.Instance.GetSuperRewardStateByDay(i) == ConstBonusStatus.CAN_GET)
+                {
+                    await ActivityAfuGiftProxy.ReqGetReward(true, (i + 1));
+                }
+            }
+
+            // 奖励弹窗
+            BonusController.TryShowBonusList(ActivityAfuGiftDataManager.Instance.GetRewardList);
+        }
+
         /// <summary>
         /// 领取所有奖励按钮
         /// </summary>
@@ -227,26 +291,7 @@ namespace GFGGame
                 return;
             }
 
-            // 一键领取
-            int passDay = ActivityAfuGiftDataManager.Instance.GetMaxPassDay();
-            for(int i = passDay - 1; i >= 0; i++)
-            {
-                int itemNormalId = ActivityAfuGiftDataManager.Instance.RewardCfgs[i].bonusFreeArr[0][0];
-                int itemVipId1 = ActivityAfuGiftDataManager.Instance.RewardCfgs[i].bonusPayArr[0][0];
-                int itemVipId2 = ActivityAfuGiftDataManager.Instance.RewardCfgs[i].bonusPayArr[1][0];
-                if (ActivityAfuGiftDataManager.Instance.CanGetNormalReward(itemNormalId))
-                {
-
-                }
-                if (ActivityAfuGiftDataManager.Instance.CanGetSuperReward(itemVipId1))
-                {
-
-                }
-                if (ActivityAfuGiftDataManager.Instance.CanGetSuperReward(itemVipId2))
-                {
-
-                }
-            }
+            GetAllReward();
         }
 
         /// <summary>
@@ -254,10 +299,28 @@ namespace GFGGame
         /// </summary>
         private void UpdateState()
         {
-            // 更新底部按钮
+            // 更新底部按钮文本
             _ui.m_c1.SetSelectedIndex(ActivityAfuGiftDataManager.Instance.GetIsBuy() ? 1 : 0);
             // 更新锁 红点状态
             _rewardListUI.numItems = ActivityAfuGiftDataManager.Instance.RewardCfgs.Count;
+            UpdateButtonState();
+        }
+
+        /// <summary>
+        /// 更新一键领取按钮状态
+        /// </summary>
+        public void UpdateButtonState()
+        {
+            if (ActivityAfuGiftDataManager.Instance.GetIsBuy())
+            {
+                // 0-普通 1-变灰
+                 _ui.m_btnGetState.SetSelectedIndex(ActivityAfuGiftDataManager.Instance.HaveCanGetReward() ? 0 : 1);
+            }
+            // 没有充值，保持常亮
+            else
+            {
+                _ui.m_btnGetState.SetSelectedIndex(0);
+            }
         }
     }
 }

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

@@ -138,9 +138,8 @@ namespace GFGGame
             _btnHaoYou.onClick.Add(OnClickBtnHaoYou);
             _btnGongGao.onClick.Add(OnClickBtnGongGao);
             _btnRenWu.onClick.Add(OnClickBtnRenWu);
-            _ui.m_btnActivityAfuGift.target.visible = false;
+            //_ui.m_btnActivityAfuGift.target.visible = false;
             _ui.m_btnActivityAfuGift.target.onClick.Add(OnClickBtnAfuGift);
-            _ui.m_btnActivityAfuGift.target.visible = false;
             _btnActivityDay7.onClick.Add(OnClickBtnDay7);
             _ui.m_btnFirstRecharge.target.onClick.Add(OnClickBtnFirstRecharge);
             // _btnStudio.onClick.Add(OnClickBtnStudio);