|
@@ -1,5 +1,6 @@
|
|
using System;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Collections.Generic;
|
|
|
|
+using System.Linq;
|
|
using ET;
|
|
using ET;
|
|
using FairyGUI;
|
|
using FairyGUI;
|
|
using UI.ActivityDay7;
|
|
using UI.ActivityDay7;
|
|
@@ -75,14 +76,29 @@ namespace GFGGame
|
|
EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
|
|
EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
|
|
// ConstMessage.NOTICE_TASK_STATE_CHANGE
|
|
// ConstMessage.NOTICE_TASK_STATE_CHANGE
|
|
EventAgent.AddEventListener(ConstMessage.NOTICE_TASK_STATE_CHANGE, OnTaskChange);
|
|
EventAgent.AddEventListener(ConstMessage.NOTICE_TASK_STATE_CHANGE, OnTaskChange);
|
|
|
|
+ EventAgent.AddEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTasksChange);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private void OnTasksChange(EventContext context)
|
|
|
|
+ {
|
|
|
|
+ var taskIds = (List<int>)context.data;
|
|
|
|
+ foreach (var _ in taskIds.Select(taskId => TaskCfgArray.Instance.GetCfg(taskId))
|
|
|
|
+ .Where(taskCfg => taskCfg is { taskType: TaskType.Day7 }))
|
|
|
|
+ {
|
|
|
|
+ TaskChange();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
private void OnTaskChange(EventContext context)
|
|
private void OnTaskChange(EventContext context)
|
|
{
|
|
{
|
|
var taskId = (int)context.data;
|
|
var taskId = (int)context.data;
|
|
var taskCfg = TaskCfgArray.Instance.GetCfg(taskId);
|
|
var taskCfg = TaskCfgArray.Instance.GetCfg(taskId);
|
|
- if (taskCfg == null) return;
|
|
|
|
- if (taskCfg.taskType != TaskType.Day7) return;
|
|
|
|
|
|
+ if (!(taskCfg is { taskType: TaskType.Day7 })) return;
|
|
|
|
+ TaskChange();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private void TaskChange()
|
|
|
|
+ {
|
|
SetDayList();
|
|
SetDayList();
|
|
SetTasks();
|
|
SetTasks();
|
|
}
|
|
}
|
|
@@ -93,6 +109,8 @@ namespace GFGGame
|
|
EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
|
|
EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
|
|
// ConstMessage.NOTICE_TASK_STATE_CHANGE
|
|
// ConstMessage.NOTICE_TASK_STATE_CHANGE
|
|
EventAgent.RemoveEventListener(ConstMessage.NOTICE_TASK_STATE_CHANGE, OnTaskChange);
|
|
EventAgent.RemoveEventListener(ConstMessage.NOTICE_TASK_STATE_CHANGE, OnTaskChange);
|
|
|
|
+ //NOTICE_BATCH_TASK_STATE_CHANGE
|
|
|
|
+ EventAgent.RemoveEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTasksChange);
|
|
}
|
|
}
|
|
|
|
|
|
private void OnItemChange(EventContext context)
|
|
private void OnItemChange(EventContext context)
|
|
@@ -124,7 +142,8 @@ namespace GFGGame
|
|
}
|
|
}
|
|
//设置按钮状态
|
|
//设置按钮状态
|
|
item.m_c1.selectedIndex = index == onClickDayIndex ? 0 : 1;
|
|
item.m_c1.selectedIndex = index == onClickDayIndex ? 0 : 1;
|
|
- RedDotController.Instance.SetComRedDot(item.target, ActivityDay7DataManager.Instance.CheckActivityDay7TaskRewrdCanGetByDay(cfg.days));
|
|
|
|
|
|
+ RedDotController.Instance.SetComRedDot(item.target,
|
|
|
|
+ ActivityDay7DataManager.Instance.CheckActivityDay7TaskRewrdCanGetByDay(cfg.days));
|
|
UI_ButtonDay.ProxyEnd();
|
|
UI_ButtonDay.ProxyEnd();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -267,7 +286,8 @@ namespace GFGGame
|
|
var cfgID = cfg.id;
|
|
var cfgID = cfg.id;
|
|
var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
|
|
var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
|
|
item.m_c2.selectedIndex = state ? 1 : 0;
|
|
item.m_c2.selectedIndex = state ? 1 : 0;
|
|
- RedDotController.Instance.SetComRedDot(item.target, ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID));
|
|
|
|
|
|
+ RedDotController.Instance.SetComRedDot(item.target,
|
|
|
|
+ ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID));
|
|
UI_ExpProcessItem.ProxyEnd();
|
|
UI_ExpProcessItem.ProxyEnd();
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -286,7 +306,7 @@ namespace GFGGame
|
|
if (!(context.sender is GObject btnGet)) return;
|
|
if (!(context.sender is GObject btnGet)) return;
|
|
var activity7DaysCfg = (Activity7DaysCfg)btnGet.data;
|
|
var activity7DaysCfg = (Activity7DaysCfg)btnGet.data;
|
|
var id = activity7DaysCfg.id;
|
|
var id = activity7DaysCfg.id;
|
|
- if(!ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(id))
|
|
|
|
|
|
+ if (!ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(id))
|
|
{
|
|
{
|
|
GoodsItemTipsController.ShowItemTips(activity7DaysCfg.bonusArr[0][0]);
|
|
GoodsItemTipsController.ShowItemTips(activity7DaysCfg.bonusArr[0][0]);
|
|
return;
|
|
return;
|