diff --git a/shared/pubUtils/taskUtil.ts b/shared/pubUtils/taskUtil.ts index 9bddf1b59..70ee30d47 100644 --- a/shared/pubUtils/taskUtil.ts +++ b/shared/pubUtils/taskUtil.ts @@ -350,9 +350,11 @@ export async function checkTaskRec(roleId: string, type: number, group: string, isMatch = taskParam[1] == param.star; break; case TASK_TYPE.HERO_QUALITY: - case TASK_TYPE.EQUIP_QUALITY: isMatch = taskParam[1] == param.quality; break; + case TASK_TYPE.EQUIP_QUALITY: + isMatch = taskParam[1] <= param.quality; + break; case TASK_TYPE.HERO_QUALITY_STAR_UP: isMatch = taskParam[1] == param.quality && taskParam[2] == param.star; break; @@ -380,7 +382,7 @@ export async function checkTaskRec(roleId: string, type: number, group: string, isMatch = param.oldLv < taskParam[1] && param.lv >= taskParam[1]; break; case TASK_TYPE.EQUIP_JEWEL_STAGE: - isMatch = param.stage == taskParam[1]; + isMatch = param.stage >= taskParam[1]; break; case TASK_TYPE.CHAT: isMatch = taskParam[0] == 0 || param.chatType == taskParam[0]; @@ -910,13 +912,13 @@ export function isComplete(_roleId: string, taskType: TASK_TYPE, taskParam: stri addCount = (param[1] == paramObj.job) ? count : 0; break; case TASK_TYPE.EQUIP_JEWEL_STAGE://count&stage& - addCount = (param[1] == paramObj.stage) ? count : 0; + addCount = (param[1] <= paramObj.stage) ? count : 0; break; case TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE://count&stage& addCount = (param[1] == paramObj.stage) ? count : 0; break; case TASK_TYPE.EQUIP_QUALITY: - addCount = param[1] == paramObj.quality ? count : 0; + addCount = param[1] <= paramObj.quality ? count : 0; break; case TASK_TYPE.ROLE_TITLE://重置数据