| 
					
				 | 
			
			
				@@ -32,6 +32,8 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _valueBarController = new ValueBarController(_ui.m_comValueBar); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _ui.m_btnback.onClick.Add(OnBtnBackClick); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _ui.m_btnGetAll.onClick.Add(OnBtnGetAllClick); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_list.itemRenderer = ListItemRender; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_listReward.itemRenderer = ListBoxRewardItemRender; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_listReward.onClickItem.Add(OnBoxRewardItemClick); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -42,27 +44,38 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             base.OnShown(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _valueBarController.OnShown(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            UpdateList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _rewardCfgs = new List<DailyActiveRewardCfg>(DailyActiveRewardCfgArray.Instance.dataArray); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            _ui.m_listReward.numItems = _rewardCfgs.Count; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            UpdateList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            UpdateReward(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         protected override void OnHide() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             base.OnHide(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void UpdateList() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _cfgs = DailyTaskDataManager.Instance.GetDailyTaskCfgs(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _cfgs = new List<DailyTaskCfg>(DailyTaskCfgArray.Instance.dataArray); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_list.numItems = _cfgs.Count; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        private void UpdateReward() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _ui.m_listReward.numItems = _rewardCfgs.Count; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _ui.m_txtDesc0.text = string.Format("今日活跃度{0}", RoleDataManager.Liveness); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _ui.m_txtDesc1.text = string.Format(",满{0}活跃度可领奖", DailyTaskDataManager.Instance.GetShowLivenessBoxNum()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(ConstItemID.LIVENESS); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void ListItemRender(int index, GObject obj) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             UI_ListItem item = UI_ListItem.Proxy(obj); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.m_c1.selectedIndex = DailyTaskDataManager.Instance.GetTaskStateById(_cfgs[index].id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 0 : 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.m_txtDesc.text = DailyTaskDataManager.Instance.GetTaskDesc(_cfgs[index].id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (item.m_btnGet.data == null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 item.m_btnGet.onClick.Add(OnBtnGetClick); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -74,18 +87,19 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.m_btnGo.data = _cfgs[index].jumpId; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (item.target.data == null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (item.m_listTaskReward.data == null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                item.m_listTaskReward.data = _cfgs[index].rewardsArr; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 item.m_listTaskReward.numItems = _cfgs[index].rewardsArr.Length; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            item.target.data = _cfgs[index].rewardsArr; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             UI_ListItem.ClearProxy(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void ListTaskRewardItemRender(int index, GObject obj) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             UI_ListTaskRewardItem item = UI_ListTaskRewardItem.Proxy(obj); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            int[][] rewards = (int[][])item.target.data; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            int[][] rewards = (int[][])item.target.parent.data; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(rewards[index][0]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -94,13 +108,13 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private async void OnBtnGetClick(EventContext context) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             GObject btnGet = context.sender as GObject; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             bool result = await DailyTaskSProxy.ReqDailyTaskBonus((int)btnGet.data); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (result) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 UpdateList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                UpdateReward(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void OnBtnGoClick(EventContext context) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -108,31 +122,30 @@ 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 ListBoxRewardItemRender(int index, GObject obj) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             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_ListBoxRewardItem.ClearProxy(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private async void OnBoxRewardItemClick(EventContext context) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            GObject item = context.sender as GObject; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            GObject item = context.data as GObject; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             DailyActiveRewardCfg cfg = item.data as DailyActiveRewardCfg; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // UI_ListRewardItem item = UI_ListRewardItem.Proxy(context.data as GObject); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (DailyTaskDataManager.Instance.GetBoxStateById(cfg.id) == ConstBonusStatus.CAN_GET) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 bool result = await DailyTaskSProxy.ReqLivenessBox(cfg.id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (result) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    _ui.m_listReward.numItems = _rewardCfgs.Count; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    UpdateReward(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             else 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -140,5 +153,21 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 ViewManager.Show<DailyTaskRewardView>(item.data); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        private void OnBtnBackClick() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ViewManager.GoBackFrom(typeof(DailyTaskView).Name); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        private async void OnBtnGetAllClick() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            bool result = await DailyTaskSProxy.ReqAllDailyTaskBonus(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (result) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                UpdateList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                UpdateReward(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |