每日任务

FGUIProject/assets/CommonGame/package.xml

@@ -190,6 +190,8 @@
     <image id="wet2taf" name="mrqd_bjbj.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
     <movieclip id="wet2td7" name="MovieClip2.jta" path="/effect/" atlas="alone_npot"/>
     <component id="kztethp" name="ComListReward.xml" path="/"/>
+    <image id="kztethq" name="test.png" path="/imagesExport/" exported="true"/>
+    <image id="kztethr" name="hyhy_btbt_1.png" path="/imagesExport/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyTask/DailyTaskRewardUI.xml

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="624,400">
+<component size="936,631">
   <displayList>
-    <list id="n0_lh8v" name="list" xy="0,102" size="624,243" layout="row" overflow="scroll" colGap="20" defaultItem="ui://eg2y0ldpj48o98">
+    <image id="n1_kzte" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,631"/>
+    <image id="n2_kzte" name="n2" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="230,32"/>
+    <text id="n3_kzte" name="txtName" xy="326,32" pivot="0.5,0" size="284,74" fontSize="56" color="#8f6e30" text="活跃度奖励"/>
+    <list id="n4_kzte" name="list" xy="29,212" size="877,199" layout="row" overflow="scroll" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldpj48o98" align="center">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <text id="n5_kzte" name="n5" xy="281,488" size="374,54" fontSize="40" color="#aa946b" text="满足20活跃度可领取"/>
   </displayList>
 </component>

FGUIProject/assets/DailyTask/package.xml

@@ -5,7 +5,7 @@
     <component id="lh8v3" name="Button1.xml" path="/components/"/>
     <component id="lh8v4" name="Button2.xml" path="/components/"/>
     <component id="lh8v5" name="ListItem.xml" path="/components/"/>
-    <component id="lh8v6" name="ListRewardItem.xml" path="/components/"/>
+    <component id="lh8v6" name="ListBoxRewardItem.xml" path="/components/"/>
     <component id="lh8v7" name="DailyTaskRewardUI.xml" path="/" exported="true"/>
     <image id="wet228" name="mrqd_ylq.png" path="/images/"/>
     <image id="wet229" name="mrqd_1.png" path="/images/"/>

FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml

@@ -3,7 +3,7 @@
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n0_10not" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,695"/>
-    <image id="n18_iftf" name="n18" src="iftfta9" fileName="images/hyhy_btbt_1.png" xy="230,32"/>
+    <image id="n18_iftf" name="n18" src="kztethr" fileName="images/hyhy_btbt_1.png" xy="230,32" pkg="eg2y0ldp"/>
     <text id="n1_10not" name="txtName" xy="354,31" pivot="0.5,0" size="228,74" fontSize="56" color="#8f6e30" text="礼包礼包"/>
     <loader id="n2_10not" name="loaIcon" xy="137,273" pivot="0.5,0.5" size="50,50" autoSize="true"/>
     <text id="n3_10not" name="txtLimit" xy="45,420" pivot="0.5,0" size="251,46" fontSize="34" color="#a3926c" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（0/1）"/>

FGUIProject/assets/RechargeStore/package.xml

@@ -41,7 +41,6 @@
     <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
     <image id="10not1w" name="jinbi_1.png" path="/imagesExport/"/>
     <image id="10not1x" name="sc_xtxtxt.png" path="/images/" scale="9grid" scale9grid="19,2,38,4"/>
-    <image id="iftfta9" name="hyhy_btbt_1.png" path="/images/"/>
     <image id="iftftaa" name="sc_cwcw_1.png" path="/images/"/>
     <image id="iftftab" name="sc_cwcw_2.png" path="/images/"/>
     <image id="iftftac" name="sc_cwcw_3.png" path="/images/"/>

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

@@ -3,8 +3,47 @@ using ET;
 
 namespace GFGGame
 {
+    public class TaskInfo
+    {
+        public int id;
+        public int state;//任务奖励状态 由ConstBonusStatus定义
+        public int progress;//进度
+    }
     public class DailyTaskDataManager : SingletonBase<DailyTaskDataManager>
     {
+        private Dictionary<int, TaskInfo> _taskInfos = new Dictionary<int, TaskInfo>();
+        private Dictionary<int, int> _livenessBoxInfos = new Dictionary<int, int>();
+
+
+        public void UpdateTaskInfo(int taskId, TaskInfo info)
+        {
+            if (!_taskInfos.ContainsKey(taskId))
+            {
+                _taskInfos.Add(taskId, info);
+            }
+            else
+            {
+                _taskInfos[taskId] = info;
+            }
+        }
+
+        public void UpdateTaskState(int taskId, int state)
+        {
+            _taskInfos[taskId].state = state;
+        }
+
+        public void UpdateLivenessBoxInfo(int boxId, int state)
+        {
+            if (!_livenessBoxInfos.ContainsKey(boxId))
+            {
+                _livenessBoxInfos.Add(boxId, state);
+            }
+            else
+            {
+                _livenessBoxInfos[boxId] = state;
+            }
+        }
+
 
         /// <summary>
         /// 获取任务列表
@@ -13,21 +52,25 @@ namespace GFGGame
         public List<DailyTaskCfg> GetDailyTaskCfgs()
         {
             List<DailyTaskCfg> cfgs = new List<DailyTaskCfg>();
-            DailyTaskCfg[] datas = DailyTaskCfgArray.Instance.dataArray;
-            for (int i = 0; i < datas.Length; i++)
+
+            foreach (int key in _taskInfos.Keys)
             {
-                if (GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) < datas[i].lv) continue;
-                cfgs.Add(datas[i]);
+                DailyTaskCfg cfg = DailyTaskCfgArray.Instance.GetCfg(key);
+                cfgs.Add(cfg);
             }
             cfgs.Sort((DailyTaskCfg a, DailyTaskCfg b) =>
             {
-                int stateA = GetTaskStateById(a.id);
-                int stateB = GetTaskStateById(b.id);
-                return stateA.CompareTo(stateB);
+                int stateA = _taskInfos[a.id].state == 1 ? 1 : -1;
+                int stateB = _taskInfos[b.id].state == 1 ? 1 : -1;
+                if (stateA > stateB) return -1;
+                if (stateB > stateA) return 1;
+                return _taskInfos[a.id].state.CompareTo(_taskInfos[b.id].state);
+
             });
             return cfgs;
         }
 
+
         /// <summary>
         /// 根据任务id获取任务状态
         /// </summary>0未完成，1可领取，2已领取
@@ -35,7 +78,30 @@ namespace GFGGame
         /// <returns></returns>
         public int GetTaskStateById(int taskId)
         {
-            return 0;
+            if (!_taskInfos.ContainsKey(taskId))
+            {
+                return 0;
+            }
+            else
+            {
+                return _taskInfos[taskId].state;
+            }
+        }
+        /// <summary>
+        /// 根据宝箱id获取宝箱状态
+        /// </summary>0未完成，1可领取，2已领取
+        /// <param name="taskId"></param>
+        /// <returns></returns>
+        public int GetBoxStateById(int boxId)
+        {
+            if (!_livenessBoxInfos.ContainsKey(boxId))
+            {
+                return 0;
+            }
+            else
+            {
+                return _livenessBoxInfos[boxId];
+            }
         }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_DailyTaskRewardUI.cs

@@ -7,6 +7,8 @@ namespace UI.DailyTask
     public partial class UI_DailyTaskRewardUI
     {
         public GComponent target;
+        public GImage m_bg;
+        public GTextField m_txtName;
         public GList m_list;
         public const string URL = "ui://5mpsibzzlh8v7";
         public const string PACKAGE_NAME = "DailyTask";
@@ -55,10 +57,14 @@ namespace UI.DailyTask
 
         private void Init(GComponent comp)
         {
+            m_bg = (GImage)comp.GetChild("bg");
+            m_txtName = (GTextField)comp.GetChild("txtName");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
+            m_txtName = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListRewardItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListBoxRewardItem.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.DailyTask
 {
-    public partial class UI_ListRewardItem
+    public partial class UI_ListBoxRewardItem
     {
         public GComponent target;
         public Controller m_c1;
@@ -12,12 +12,12 @@ namespace UI.DailyTask
         public GTextField m_txtTitle;
         public const string URL = "ui://5mpsibzzlh8v6";
         public const string PACKAGE_NAME = "DailyTask";
-        public const string RES_NAME = "ListRewardItem";
-        private static UI_ListRewardItem _proxy;
+        public const string RES_NAME = "ListBoxRewardItem";
+        private static UI_ListBoxRewardItem _proxy;
 
-        public static UI_ListRewardItem Create(GObject gObject = null)
+        public static UI_ListBoxRewardItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListRewardItem();
+            var ui = new UI_ListBoxRewardItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.DailyTask
             return ui;
         }
 
-        public static UI_ListRewardItem Proxy(GObject gObject = null)
+        public static UI_ListBoxRewardItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListRewardItem();
+                _proxy = new UI_ListBoxRewardItem();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListRewardItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListBoxRewardItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 73e9369d43ecf9d4e9c3ff48e9cb6ff2
+guid: 064bc031d6a29f74a899f7b3a20210e8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -2,20 +2,119 @@ using System.Collections.Generic;
 using ET;
 using GFGGame;
 
+namespace ET
+{
+
+    public class NoticeDailyTaskInfoChange : AMHandler<M2C_DailyTaskInfoChange>
+    {
+        protected override async ETTask Run(Session session, M2C_DailyTaskInfoChange message)
+        {
+            TaskInfo taskInfo = new TaskInfo();
+            taskInfo.id = message.TaskInfo.Id;
+            taskInfo.state = message.TaskInfo.Status;
+            taskInfo.progress = message.TaskInfo.Progress;
+            DailyTaskDataManager.Instance.UpdateTaskInfo(taskInfo.id, taskInfo);
+
+            await ETTask.CompletedTask;
+        }
+    }
+    public class NoticeLivenessBoxChange : AMHandler<M2C_LivenessBoxChange>
+    {
+        protected override async ETTask Run(Session session, M2C_LivenessBoxChange message)
+        {
+            for (int i = 0; i < message.kLivenessBox.Count; i++)
+            {
+                DailyTaskDataManager.Instance.UpdateLivenessBoxInfo(message.kLivenessBox[i], message.vLivenessBox[i]);
+            }
+
 
+            await ETTask.CompletedTask;
+        }
+    }
+}
 namespace GFGGame
 {
     public static class DailyTaskSProxy
     {
-        public static async ETTask<bool> ClothingDecompose(List<int> itemIds, List<int> itemNums)
+        public static async ETTask<bool> ReqDailyTaskInfos(List<int> itemIds, List<int> itemNums)
         {
-            M2C_ClothingDecompose response = null;
-            response = (M2C_ClothingDecompose)await MessageHelper.SendToServer(new C2M_ClothingDecompose() { itemIds = itemIds, itemNums = itemNums });
+            M2C_GetDailyTaskInfos response = null;
+            response = (M2C_GetDailyTaskInfos)await MessageHelper.SendToServer(new C2M_GetDailyTaskInfos());
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.bonusList));
+                    for (int i = 0; i < response.TaskList.Count; i++)
+                    {
+                        TaskInfo taskInfo = new TaskInfo();
+                        taskInfo.id = response.TaskList[i].Id;
+                        taskInfo.state = response.TaskList[i].Status;
+                        taskInfo.progress = response.TaskList[i].Progress;
+                        DailyTaskDataManager.Instance.UpdateTaskInfo(taskInfo.id, taskInfo);
+                    }
+                    for (int i = 0; i < response.kLivenessBox.Count; i++)
+                    {
+                        DailyTaskDataManager.Instance.UpdateLivenessBoxInfo(response.kLivenessBox[i], response.vLivenessBox[i]);
+                    }
+
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqDailyTaskBonus(int taskId)
+        {
+            M2C_GetDailyTaskBonus response = null;
+            response = (M2C_GetDailyTaskBonus)await MessageHelper.SendToServer(new C2M_GetDailyTaskBonus() { Id = taskId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    DailyTaskDataManager.Instance.UpdateTaskState(response.Id, response.Status);
+                    int[][] bonus = DailyTaskCfgArray.Instance.GetCfg(response.Id).rewardsArr;
+                    BonusController.TryShowBonusList(bonus);
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqAllDailyTaskBonus(List<int> itemIds, List<int> itemNums)
+        {
+            M2C_GetAllDailyTaskBonus response = null;
+            response = (M2C_GetAllDailyTaskBonus)await MessageHelper.SendToServer(new C2M_GetAllDailyTaskBonus());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    // BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.bonusList));
+                    for (int i = 0; i < response.TaskList.Count; i++)
+                    {
+                        TaskInfo taskInfo = new TaskInfo();
+                        taskInfo.id = response.TaskList[i].Id;
+                        taskInfo.state = response.TaskList[i].Status;
+                        taskInfo.progress = response.TaskList[i].Progress;
+                        DailyTaskDataManager.Instance.UpdateTaskInfo(taskInfo.id, taskInfo);
+                    }
+                    List<ItemData> itemDatas = ItemUtil.CreateItemDataList(response.BonusList);
+                    BonusController.TryShowBonusList(itemDatas);
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqLivenessBox(int boxId)
+        {
+            M2C_GetLivenessBox response = null;
+            response = (M2C_GetLivenessBox)await MessageHelper.SendToServer(new C2M_GetLivenessBox() { Id = boxId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    // BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.bonusList));
+                    DailyTaskDataManager.Instance.UpdateLivenessBoxInfo(response.Id, response.Status);
+                    int[][] bonus = DailyActiveRewardCfgArray.Instance.GetCfg(response.Id).rewardsArr;
+                    BonusController.TryShowBonusList(bonus);
+
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs

@@ -33,8 +33,8 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
             _ui.m_list.itemRenderer = ListItemRender;
-            _ui.m_listReward.itemRenderer = ListRewardItemRender;
-
+            _ui.m_listReward.itemRenderer = ListBoxRewardItemRender;
+            _ui.m_listReward.onClickItem.Add(OnBoxRewardItemClick);
         }
 
         protected override void OnShown()
@@ -42,9 +42,8 @@ namespace GFGGame
             base.OnShown();
             _valueBarController.OnShown();
 
-            _cfgs = DailyTaskDataManager.Instance.GetDailyTaskCfgs();
+            UpdateList();
             _rewardCfgs = new List<DailyActiveRewardCfg>(DailyActiveRewardCfgArray.Instance.dataArray);
-            _ui.m_list.numItems = _cfgs.Count;
             _ui.m_listReward.numItems = _rewardCfgs.Count;
         }
 
@@ -52,6 +51,12 @@ namespace GFGGame
         {
             base.OnHide();
         }
+        private void UpdateList()
+        {
+            _cfgs = DailyTaskDataManager.Instance.GetDailyTaskCfgs();
+            _ui.m_list.numItems = _cfgs.Count;
+
+        }
         private void ListItemRender(int index, GObject obj)
         {
             UI_ListItem item = UI_ListItem.Proxy(obj);
@@ -69,12 +74,33 @@ namespace GFGGame
             }
             item.m_btnGo.data = _cfgs[index].jumpId;
 
+            if (item.target.data == null)
+            {
+                item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
+                item.m_listTaskReward.numItems = _cfgs[index].rewardsArr.Length;
+            }
+            item.target.data = _cfgs[index].rewardsArr;
             UI_ListItem.ClearProxy();
         }
-        private void OnBtnGetClick(EventContext context)
+        private void ListTaskRewardItemRender(int index, GObject obj)
+        {
+            UI_ListTaskRewardItem item = UI_ListTaskRewardItem.Proxy(obj);
+            int[][] rewards = (int[][])item.target.data;
+
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(rewards[index][0]);
+            item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+            item.m_txtNum.text = rewards[index][1].ToString();
+        }
+        private async void OnBtnGetClick(EventContext context)
         {
             GObject btnGet = context.sender as GObject;
 
+            bool result = await DailyTaskSProxy.ReqDailyTaskBonus((int)btnGet.data);
+            if (result)
+            {
+                UpdateList();
+            }
+
         }
         private void OnBtnGoClick(EventContext context)
         {
@@ -82,24 +108,37 @@ namespace GFGGame
             GObject btnGo = context.sender as GObject;
             ViewManager.Show(string.Format("GFGGame.{0}", btnGo.data), null, new object[] { typeof(DailyTaskView).Name, this.viewData });
         }
-        private void ListRewardItemRender(int index, GObject obj)
+        private void ListBoxRewardItemRender(int index, GObject obj)
         {
-            UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
-
-            if (item.target.data == null)
-            {
-                item.target.onClick.Add(OnRewardItemClick);
-            }
+            UI_ListBoxRewardItem item = UI_ListBoxRewardItem.Proxy(obj);
+            DailyActiveRewardCfg cfg = _rewardCfgs[index];
+            item.m_c1.selectedIndex = DailyTaskDataManager.Instance.GetBoxStateById(cfg.id);
+            item.m_txtNum.text = cfg.count.ToString();
+            // if (item.target.data == null)
+            // {
+            //     item.target.onClick.Add(OnBoxRewardItemClick);
+            // }
             item.target.data = _rewardCfgs[index];
-            UI_ListRewardItem.ClearProxy();
+            UI_ListBoxRewardItem.ClearProxy();
         }
 
-        private void OnRewardItemClick(EventContext context)
+        private async void OnBoxRewardItemClick(EventContext context)
         {
             GObject item = context.sender as GObject;
+            DailyActiveRewardCfg cfg = item.data as DailyActiveRewardCfg;
             // UI_ListRewardItem item = UI_ListRewardItem.Proxy(context.data as GObject);
-
-            ViewManager.Show<DailyTaskRewardView>(item.data);
+            if (DailyTaskDataManager.Instance.GetBoxStateById(cfg.id) == ConstBonusStatus.CAN_GET)
+            {
+                bool result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
+                if (result)
+                {
+                    _ui.m_listReward.numItems = _rewardCfgs.Count;
+                }
+            }
+            else
+            {
+                ViewManager.Show<DailyTaskRewardView>(item.data);
+            }
         }
     }
 }