|
@@ -105,7 +105,7 @@ namespace GFGGame
|
|
}
|
|
}
|
|
private async void OnClickRewardTIps()
|
|
private async void OnClickRewardTIps()
|
|
{
|
|
{
|
|
- if(canGetReward)
|
|
|
|
|
|
+ if(MiniGameDateManager.Instance.NpcInfoList[npcId].RewrdStatus == 1)
|
|
{
|
|
{
|
|
bool result = await ActivityTeaSProxy.ReqGetNPCVisitReward(activityId, npcId);
|
|
bool result = await ActivityTeaSProxy.ReqGetNPCVisitReward(activityId, npcId);
|
|
if (!result) return;
|
|
if (!result) return;
|
|
@@ -129,7 +129,7 @@ namespace GFGGame
|
|
case 1:
|
|
case 1:
|
|
canGetReward = true;
|
|
canGetReward = true;
|
|
_ui.m_gotReward.visible = false;
|
|
_ui.m_gotReward.visible = false;
|
|
- RedDotController.Instance.SetComRedDot(_ui.m_taskIcon.target, (canGetReward && redDot));
|
|
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_ui.m_taskIcon.target, MiniGameDateManager.Instance.NpcInfoList[npcId].RewrdStatus == 1);
|
|
break;
|
|
break;
|
|
case 2:
|
|
case 2:
|
|
canGetReward = false;
|
|
canGetReward = false;
|
|
@@ -149,7 +149,14 @@ namespace GFGGame
|
|
var tasks = (List<TaskCfg>)obj.parent.data;
|
|
var tasks = (List<TaskCfg>)obj.parent.data;
|
|
var taskCfg = tasks[index];
|
|
var taskCfg = tasks[index];
|
|
item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(taskCfg.id);
|
|
item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(taskCfg.id);
|
|
- item.m_c2.selectedIndex = taskCfg.jumpId == "" ? 1 : 0;
|
|
|
|
|
|
+ if (taskCfg.jumpId == "" && TaskDataManager.Instance.GetTaskStateById(taskCfg.id) != 1)
|
|
|
|
+ {
|
|
|
|
+ item.m_c2.selectedIndex = taskCfg.jumpId == "" ? 1 : 0;
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ item.m_c2.selectedIndex = 0;
|
|
|
|
+ }
|
|
item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(taskCfg.id);
|
|
item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(taskCfg.id);
|
|
item.m_txtCount.text =
|
|
item.m_txtCount.text =
|
|
$"{TaskDataManager.Instance.GetTaskProgressById(taskCfg.id)}/{taskCfg.GetTargetCount()}";
|
|
$"{TaskDataManager.Instance.GetTaskProgressById(taskCfg.id)}/{taskCfg.GetTargetCount()}";
|