添加奖励详细介绍UI

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_DBGiftItem
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://t8nwuj7ievdh28";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "DBGiftItem";
+        private static UI_DBGiftItem _proxy;
+
+        public static UI_DBGiftItem Create(GObject gObject = null)
+        {
+            var ui = new UI_DBGiftItem();
+            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_DBGiftItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DBGiftItem();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -8,10 +8,10 @@ namespace UI.DailyWelfare
     {
         public GComponent target;
         public UI_ProgressBar2 m_progress;
-        public GComponent m_DBGiftItem1;
-        public GComponent m_DBGiftItem2;
-        public GComponent m_DBGiftItem3;
-        public GComponent m_DBGiftItem4;
+        public UI_DBGiftItem m_DBGiftItem1;
+        public UI_DBGiftItem m_DBGiftItem2;
+        public UI_DBGiftItem m_DBGiftItem3;
+        public UI_DBGiftItem m_DBGiftItem4;
         public GTextField m_txtTime;
         public GGroup m_grpTime;
         public GButton m_btnTest;
@@ -63,10 +63,10 @@ namespace UI.DailyWelfare
         private void Init(GComponent comp)
         {
             m_progress = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progress"));
-            m_DBGiftItem1 = (GComponent)comp.GetChild("DBGiftItem1");
-            m_DBGiftItem2 = (GComponent)comp.GetChild("DBGiftItem2");
-            m_DBGiftItem3 = (GComponent)comp.GetChild("DBGiftItem3");
-            m_DBGiftItem4 = (GComponent)comp.GetChild("DBGiftItem4");
+            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_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
             m_btnTest = (GButton)comp.GetChild("btnTest");
@@ -75,9 +75,13 @@ namespace UI.DailyWelfare
         {
             m_progress.Dispose();
             m_progress = null;
+            m_DBGiftItem1.Dispose();
             m_DBGiftItem1 = null;
+            m_DBGiftItem2.Dispose();
             m_DBGiftItem2 = null;
+            m_DBGiftItem3.Dispose();
             m_DBGiftItem3 = null;
+            m_DBGiftItem4.Dispose();
             m_DBGiftItem4 = null;
             m_txtTime = null;
             m_grpTime = null;

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

@@ -11,6 +11,7 @@ namespace UI.DailyWelfare
         public UI_ComProBonus2 m_comProBonus1;
         public UI_ComProBonus2 m_comProBonus2;
         public UI_ComProBonus2 m_comProBonus3;
+        public GGroup m_comProBonusGroup;
         public GGraph m_holder;
         public GGraph m_holderReward;
         public const string URL = "ui://t8nwuj7ievdh26";
@@ -64,6 +65,7 @@ namespace UI.DailyWelfare
             m_comProBonus1 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus1"));
             m_comProBonus2 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus2"));
             m_comProBonus3 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus3"));
+            m_comProBonusGroup = (GGroup)comp.GetChild("comProBonusGroup");
             m_holder = (GGraph)comp.GetChild("holder");
             m_holderReward = (GGraph)comp.GetChild("holderReward");
         }
@@ -77,6 +79,7 @@ namespace UI.DailyWelfare
             m_comProBonus2 = null;
             m_comProBonus3.Dispose();
             m_comProBonus3 = null;
+            m_comProBonusGroup = null;
             m_holder = null;
             m_holderReward = null;
             if(disposeTarget && target != null)

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

@@ -17,9 +17,6 @@ namespace UI.Main
         public UI_ButtonModle1 m_btnZhaiXing;
         public UI_ButtonModle1 m_btnHaiZhiShi;
         public GGraph m_BottomEffectHolder;
-        public UI_BtnModle m_btnFirstRecharge;
-        public UI_BtnModle m_btnGiftBag1;
-        public UI_BtnModle m_btnGiftBag2;
         public UI_ComponentHeadBar m_headBar;
         public GButton m_btnYouJian;
         public GButton m_btnGongGao;
@@ -30,6 +27,9 @@ namespace UI.Main
         public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
         public UI_BtnModle2 m_btnLimitedRechargeDBGift;
+        public UI_BtnModle m_btnFirstRecharge;
+        public UI_BtnModle m_btnGiftBag1;
+        public UI_BtnModle m_btnGiftBag2;
         public GGroup m_grpLeft;
         public GButton m_loaLeft;
         public UI_ButtonModle7 m_btn1;
@@ -103,9 +103,6 @@ namespace UI.Main
             m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
             m_btnHaiZhiShi = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHaiZhiShi"));
             m_BottomEffectHolder = (GGraph)comp.GetChild("BottomEffectHolder");
-            m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
-            m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
-            m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_btnYouJian = (GButton)comp.GetChild("btnYouJian");
             m_btnGongGao = (GButton)comp.GetChild("btnGongGao");
@@ -116,6 +113,9 @@ namespace UI.Main
             m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
             m_btnLimitedRechargeDBGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnLimitedRechargeDBGift"));
+            m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
+            m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
+            m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
             m_grpLeft = (GGroup)comp.GetChild("grpLeft");
             m_loaLeft = (GButton)comp.GetChild("loaLeft");
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
@@ -151,12 +151,6 @@ namespace UI.Main
             m_btnHaiZhiShi.Dispose();
             m_btnHaiZhiShi = null;
             m_BottomEffectHolder = null;
-            m_btnFirstRecharge.Dispose();
-            m_btnFirstRecharge = null;
-            m_btnGiftBag1.Dispose();
-            m_btnGiftBag1 = null;
-            m_btnGiftBag2.Dispose();
-            m_btnGiftBag2 = null;
             m_headBar.Dispose();
             m_headBar = null;
             m_btnYouJian = null;
@@ -174,6 +168,12 @@ namespace UI.Main
             m_btnActivityLuckyBox = null;
             m_btnLimitedRechargeDBGift.Dispose();
             m_btnLimitedRechargeDBGift = null;
+            m_btnFirstRecharge.Dispose();
+            m_btnFirstRecharge = null;
+            m_btnGiftBag1.Dispose();
+            m_btnGiftBag1 = null;
+            m_btnGiftBag2.Dispose();
+            m_btnGiftBag2 = null;
             m_grpLeft = null;
             m_loaLeft = null;
             m_btn1.Dispose();

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

@@ -0,0 +1,10 @@
+using System.Collections;
+using UnityEngine;
+
+namespace Assets.Game.HotUpdate.Views.DailyWelfare
+{
+    public class GiftDetailView : MonoBehaviour
+    {
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/GiftDetailView.cs.meta

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

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

@@ -86,7 +86,7 @@ namespace GFGGame
         private void UpdateView()
         {
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityId);
-            _rechargeCfgs = SoreCfg(_rechargeCfgs);
+            _rechargeCfgs = SortCfg(_rechargeCfgs);
             _ui.m_list.numItems = _rechargeCfgs.Count;
             ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xslc_banner_" + openCfg.res);
@@ -100,7 +100,7 @@ namespace GFGGame
             item.m_txtTitle.text = string.Format("活动期间累计获得{0}会员积分({1}/{2})", _rechargeCfgs[index].value, limitChargeExp, _rechargeCfgs[index].value);
             if (limitChargeExp >= _rechargeCfgs[index].value)
             {
-                item.m_c1.selectedIndex = _activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) >= 0 ? 2 : 1;
+                item.m_c1.selectedIndex = _activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) >= 0 ? 2 : 1; 
             }
             else
             {
@@ -139,7 +139,7 @@ namespace GFGGame
             int id = (int)obj.data;
             ActivityGlobalSProxy.ReqGetActivityBonus(_activityId, id).Coroutine();
         }
-        private List<ActivityRechargeCfg> SoreCfg(List<ActivityRechargeCfg> rechargeCfgs)
+        private List<ActivityRechargeCfg> SortCfg(List<ActivityRechargeCfg> rechargeCfgs)
         {
             rechargeCfgs.Sort((ActivityRechargeCfg a, ActivityRechargeCfg b) =>
             {

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

@@ -1,6 +1,7 @@
-using FairyGUI;
+using ET;
+using FairyGUI;
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using UI.DailyWelfare;
 using UnityEngine;
 
@@ -10,9 +11,10 @@ namespace GFGGame
     {
         private UI_LimitedRechargeDBGiftUI _ui;
 
-        private int _count = 0;
         private int _minProgressOffset = 6;
         private int _maxProgressOffset = -8;
+        private ActivityInfo _activityInfo;
+        private ActivityRecharge2Cfg[] _rechargeCfgs;
 
         public override void Dispose()
         {
@@ -35,35 +37,44 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnTest.onClick.Add(OnClickBtnTest);
+            _rechargeCfgs = ActivityRecharge2CfgArray.Instance.dataArray;
             InitProgressValueList();
+            InitReward();
         }
 
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_REWARD_ADD, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_COUNT_VALUE_CHANGE, UpdateView);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_REWARD_ADD, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_COUNT_VALUE_CHANGE, UpdateView);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
 
-            _count = 0;
+            UpdateView();
             UpdateProgress();
+            Timers.inst.Add(1, 0, UpdateTime);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(UpdateTime);
         }
 
         private void OnClickBtnTest(EventContext context)
         {
-            _count += 10;
             UpdateProgress();
         }
 
@@ -74,6 +85,7 @@ namespace GFGGame
         private void InitProgressValueList()
         {
             _progressValuePart = new int[_partNum];
+            _ui.m_progress.target.max = _rechargeCfgs[_rechargeCfgs.Length - 1].value;
             int max = (int)_ui.m_progress.target.max;
             int average = (int)Mathf.Ceil((float)(_ui.m_progress.target.max / (_partNum - 1)));
 
@@ -85,21 +97,33 @@ namespace GFGGame
             }
         }
 
+        /// <summary>
+        /// 初始化奖励的UI
+        /// </summary>
+        private void InitReward()
+        {
+            // 包子图
+
+            // 大奖icon
+
+        }
+
         private void UpdateProgress()
         {
             int max = (int)_ui.m_progress.target.max;
+            long count = _activityInfo.CountValue;
 
             // 确定count的区间
-            if (_count == 0 || _count == max)
+            if (count == 0 || count == max)
             {
-                _ui.m_progress.target.value = _count;
+                _ui.m_progress.target.value = count;
             }
             else
             {
                 int index = 1;
                 for (; index < _progressValuePart.Length; index++)
                 {
-                    if (_count < _progressValuePart[index])
+                    if (count < _progressValuePart[index])
                     {
                         --index;
                         break;
@@ -110,15 +134,93 @@ namespace GFGGame
                 int minProgressValue = _progressValuePart[index] + _minProgressOffset;
                 int maxProgressValue = _progressValuePart[index + 1] + _maxProgressOffset;
 
-                if(_count == _progressValuePart[index] || _count == _progressValuePart[index + 1])
+                if (count == _progressValuePart[index] || count == _progressValuePart[index + 1])
                 {
-                    _ui.m_progress.target.value = _count;
+                    _ui.m_progress.target.value = count;
                 }
                 else
                 {
-                    _ui.m_progress.target.value = Mathf.Clamp(_count, minProgressValue, maxProgressValue);
+                    _ui.m_progress.target.value = Mathf.Clamp(count, minProgressValue, maxProgressValue);
+                }
+
+                // 检测玩家是否领取奖励
+                UpdateRewardState(index);
+            }
+        }
+
+        private void UpdateTime(object param)
+        {
+            long curTime = TimeHelper.ServerNow();
+            long endTime = _activityInfo.EndTime;
+            _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+        }
+
+        private void UpdateView()
+        {
+            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            UpdateProgress();
+        }
+
+        private struct GetState
+        {
+            public int index;
+            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));
+                bonus.target.data = new GetState
+                {
+                    index = i,
+                    canGet = arrive
+                };
+
+                // 玩家已经达到的奖励
+                if (arrive)
+                {
+                    // 已领
+                    if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) > 0)
+                    {
+                        bonus.m_imgGot.visible = true;
+                        bonus.target.touchable = false;
+                        // 隐藏红点
+                        RedDotController.Instance.SetComRedDot(bonus.target, false);
+                    }
+                    // 未领
+                    else
+                    {
+                        bonus.m_imgGot.visible = false;
+                        // 显示红点
+                        RedDotController.Instance.SetComRedDot(bonus.target, true);
+                    }
                 }
-                Debug.LogError("count:" + _count + "," + "progress:" + _ui.m_progress.target.value);
+                bonus.target.onClick.Set(OnClickGift);
+                UI_ComProBonus2.ProxyEnd();
+            }
+        }
+
+        private void OnClickGift(EventContext eventContext)
+        {
+            GObject gObject = (GObject)eventContext.data;
+            GetState getState = (GetState)gObject.data;
+
+            if (getState.canGet)
+            {
+                ActivityGlobalSProxy.ReqGetActivityBonus(_activityInfo.ActivityId, _rechargeCfgs[getState.index].id).Coroutine();
+            }
+            else
+            {
+                // 显示奖励详细列表
+                //ViewManager.Show<UI_GiftDetailUI>
             }
         }
     }

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

@@ -748,6 +748,7 @@ namespace GFGGame
                     _ui.m_btnGiftBag1.target.visible = true;
                 }
             }
+
         }
 
         private void Update(object param)
@@ -913,6 +914,9 @@ namespace GFGGame
         }
         private void CheckFunOpen()
         {
+            _ui.m_btnGiftBag1.target.visible = false;
+            _ui.m_btnGiftBag2.target.visible = false;
+
             _ui.m_btnXiuFang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
             _ui.m_btnHuanZhuang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
             _ui.m_btnCiPai.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);