diff --git a/game-server/app/servers/role/handler/equipHandler.ts b/game-server/app/servers/role/handler/equipHandler.ts index de25ebb11..0d202a895 100644 --- a/game-server/app/servers/role/handler/equipHandler.ts +++ b/game-server/app/servers/role/handler/equipHandler.ts @@ -326,6 +326,7 @@ export class EquipHandler { let curEquip = equip; pushEquipRefineSucMsg(roleId, roleName, serverId, curEplace, curEquip ? curEquip.quality : 0); await checkTask(roleId, sid, funcs, TASK_TYPE.EQUIP_REFINE, 1, true, {}); + await accomplishTask(roleId, TASK_TYPE.EQUIP_REFINE_LV, 1, { lv: curEplace.refineLv }); } return resResult(STATUS.SUCCESS, { isSuccess, curHero }); } diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts index 641ccb363..a2b837f53 100644 --- a/game-server/app/servers/role/handler/heroHandler.ts +++ b/game-server/app/servers/role/handler/heroHandler.ts @@ -461,6 +461,7 @@ export class HeroHandler { hero = await calPlayerCeAndSave(HERO_SYSTEM_TYPE.STAGEUP, sid, roleId, hero, update); // 任务 await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_STAGE_UP, hero); + await accomplishTask(roleId, TASK_TYPE.HERO_STAGE_UP, 1, { job: hero.job }); return resResult(STATUS.SUCCESS, { curHero: { hid: hero.hid, job: hero.job, jobStage: hero.jobStage } }); } diff --git a/shared/consts/constModules/sysConst.ts b/shared/consts/constModules/sysConst.ts index b5401b046..7171606c7 100644 --- a/shared/consts/constModules/sysConst.ts +++ b/shared/consts/constModules/sysConst.ts @@ -652,6 +652,7 @@ export enum TASK_TYPE { HERO_QUALITY_TO_QUALITY_COUNT = 74,// *名武将*品升*品 HERO_WAKE_UP_COUNT = 75, // *名武将*品觉醒 HERO_WAKE_UP_STAR_UP_COUNT = 76, // *名武将升至觉醒*星 + EQUIP_REFINE_LV = 77, // *件装备成功精炼到*级 } // 卡池类型 diff --git a/shared/pubUtils/taskUtil.ts b/shared/pubUtils/taskUtil.ts index 78ce50786..357e39680 100644 --- a/shared/pubUtils/taskUtil.ts +++ b/shared/pubUtils/taskUtil.ts @@ -520,7 +520,13 @@ export async function accomplishTask(roleId: string, taskType: TASK_TYPE, count: if (taskType === TASK_TYPE.HERO_QUALITY_STAR_UP || taskType === TASK_TYPE.HERO_QUALITY_TO_QUALITY_COUNT || taskType === TASK_TYPE.HERO_WAKE_UP_COUNT || - taskType === TASK_TYPE.HERO_WAKE_UP_STAR_UP_COUNT) { + taskType === TASK_TYPE.HERO_WAKE_UP_STAR_UP_COUNT || + + taskType === TASK_TYPE.EQUIP_STRENGTHEN || + taskType === TASK_TYPE.EQUIP_REFINE_LV || + taskType === TASK_TYPE.HERO_STAGE_UP + + ) { allActivity = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.THIRTY_DAYS, new Date()); for (let activity of allActivity) { let thirtyDaysActivity = new ThirtyDaysData(activity); @@ -578,6 +584,9 @@ export function isComplete(roleId: string, taskType: TASK_TYPE, taskParam: strin case TASK_TYPE.HERO_WAKE_UP_STAR_UP_COUNT://herocount&star& addCount = (param[1] == paramObj.star) ? count : 0; break; + case TASK_TYPE.HERO_STAGE_UP://herocount&star& + addCount = (param[1] == paramObj.job) ? count : 0; + break; case TASK_TYPE.ROLE_TITLE://重置数据 @@ -597,6 +606,10 @@ export function isComplete(roleId: string, taskType: TASK_TYPE, taskParam: strin } } break; + case TASK_TYPE.EQUIP_REFINE_LV: + addCount = (param[1] == paramObj.lv) ? count : 0; + break; + case TASK_TYPE.BATTLE_MAIN: addCount = param[0] == paramObj.warId ? 1 : 0; break; diff --git a/shared/resource/jsons/dic_zyz_taskType.json b/shared/resource/jsons/dic_zyz_taskType.json index e79d4377a..87c301017 100644 --- a/shared/resource/jsons/dic_zyz_taskType.json +++ b/shared/resource/jsons/dic_zyz_taskType.json @@ -1138,5 +1138,20 @@ "__EMPTY_3": 0, "__EMPTY_4": 0, "__EMPTY_5": 0 + }, + { + "id": 77, + "name": "装备", + "info": "x件装备成功精炼到x级", + "param": "count&lv", + "string": "装备件数&精炼等级", + "content": 0, + "condition": "count", + "__EMPTY": 0, + "__EMPTY_1": 0, + "__EMPTY_2": 0, + "__EMPTY_3": 0, + "__EMPTY_4": 0, + "__EMPTY_5": 0 } ] \ No newline at end of file