|
|
@@ -91,56 +91,45 @@ namespace GFGGame
|
|
|
_ui.m_TaskList.numItems = _cfgs.Count;
|
|
|
}
|
|
|
|
|
|
- private void UpdateList()
|
|
|
- {
|
|
|
- _cfgs = TaskDataManager.Instance.GetTaskCfgs(TaskType.Daily);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
private void TaskItemIndex(int index, GObject obj)
|
|
|
{
|
|
|
var item = UI_TaskListItem.Proxy(obj);
|
|
|
//领取状态
|
|
|
- item.m_c1.selectedIndex =TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
|
|
|
- UI_TaskListItem.ProxyEnd();
|
|
|
- }
|
|
|
+ item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
|
|
|
+ item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
|
|
|
+ item.m_txtCount.text =
|
|
|
+ $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].count}";
|
|
|
+ if (item.m_GetRewardBt.data == null)
|
|
|
+ {
|
|
|
+ item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
|
|
|
+ }
|
|
|
|
|
|
- private void ListItemRender(int index, GObject obj)
|
|
|
- {
|
|
|
- // var item = UI_ListItem.Proxy(obj);
|
|
|
- // item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
|
|
|
- // item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 0 : 1;
|
|
|
- // item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
|
|
|
- // item.m_txtCount.text = string.Format("{0}/{1}", TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id), _cfgs[index].count);
|
|
|
- // if (item.m_btnGet.data == null)
|
|
|
- // {
|
|
|
- // item.m_btnGet.onClick.Add(OnBtnGetClick);
|
|
|
- // }
|
|
|
- // item.m_btnGet.data = _cfgs[index].id;
|
|
|
- // if (item.m_btnGo.data == null)
|
|
|
- // {
|
|
|
- // item.m_btnGo.onClick.Add(OnBtnGoClick);
|
|
|
- // }
|
|
|
- // item.m_btnGo.data = _cfgs[index].jumpId;
|
|
|
- //
|
|
|
- // 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;
|
|
|
- // UI_ListItem.ClearProxy();
|
|
|
+ item.m_GetRewardBt.data = _cfgs[index].id;
|
|
|
+ if (item.m_ComeBt.data == null)
|
|
|
+ {
|
|
|
+ item.m_ComeBt.onClick.Add(OnBtnGoClick);
|
|
|
+ }
|
|
|
+
|
|
|
+ item.m_ComeBt.data = _cfgs[index].jumpId;
|
|
|
+
|
|
|
+ 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;
|
|
|
+ UI_TaskListItem.ProxyEnd();
|
|
|
}
|
|
|
|
|
|
- private void ListTaskRewardItemRender(int index, GObject obj)
|
|
|
+ private static void ListTaskRewardItemRender(int index, GObject obj)
|
|
|
{
|
|
|
- // var item = UI_ListTaskRewardItem.Proxy(obj);
|
|
|
- // var rewards = (int[][])item.target.parent.data;
|
|
|
- //
|
|
|
- // var itemCfg = ItemCfgArray.Instance.GetCfg(rewards[index][0]);
|
|
|
- // item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
|
|
|
- // item.m_txtNum.text = $"x{rewards[index][1]}";
|
|
|
- // UI_ListTaskRewardItem.ProxyEnd();
|
|
|
+ var item = UI_RewardIconYellow.Proxy(obj);
|
|
|
+ var rewards = (int[][])item.target.parent.data;
|
|
|
+ var itemCfg = ItemCfgArray.Instance.GetCfg(rewards[index][0]);
|
|
|
+ item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
|
|
|
+ item.m_num.text = $"{rewards[index][1]}";
|
|
|
+ UI_RewardIconYellow.ProxyEnd();
|
|
|
}
|
|
|
|
|
|
private async void OnBtnGetClick(EventContext context)
|
|
|
@@ -160,19 +149,6 @@ namespace GFGGame
|
|
|
ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(CombTaskView).FullName, viewData }, true);
|
|
|
}
|
|
|
|
|
|
- private void ListBoxRewardItemRender(int index, GObject obj)
|
|
|
- {
|
|
|
- // var item = UI_ListBoxRewardItem.Proxy(obj);
|
|
|
- // var cfg = _rewardCfgs[index];
|
|
|
- // var state = DailyTaskDataManager.Instance.GetBoxStateById(cfg.id);
|
|
|
- // item.m_c1.selectedIndex = state;
|
|
|
- // item.m_txtNum.text = cfg.count.ToString();
|
|
|
- // RedDotController.Instance.SetComRedDot(item.target, state == ConstBonusStatus.CAN_GET, "", 12, 4);
|
|
|
- //
|
|
|
- // item.target.data = _rewardCfgs[index];
|
|
|
- // UI_ListBoxRewardItem.ClearProxy();
|
|
|
- }
|
|
|
-
|
|
|
private async void OnBoxRewardItemClick(EventContext context)
|
|
|
{
|
|
|
var item = context.data as GObject;
|
|
|
@@ -189,8 +165,7 @@ namespace GFGGame
|
|
|
else
|
|
|
{
|
|
|
var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
|
|
|
- ViewManager.Show<RewardPreView>(new object[]
|
|
|
- { rewards, "活跃度奖励", string.Format("满足{0}活跃度可领取", cfg.count) });
|
|
|
+ ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
|
|
|
}
|
|
|
}
|
|
|
|
Jae