diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts index 4f0e1cff3..f285260fe 100644 --- a/game-server/app/servers/activity/handler/gachaHandler.ts +++ b/game-server/app/servers/activity/handler/gachaHandler.ts @@ -17,6 +17,7 @@ import { RECRUIT } from "../../../pubUtils/dicParam"; import { getAllHeroByQuality } from "../../../services/gachaService"; import { transPiece } from "../../../pubUtils/itemUtils"; import { CreateHeroParam } from "../../../domain/roleField/hero"; +import { accomplishTask } from "../../../pubUtils/taskUtil"; export default function (app: Application) { return new GachaHandler(app); @@ -130,6 +131,8 @@ export class GachaHandler { // 任务 await checkTask(roleId, sid, funcs, TASK_TYPE.GASHA, count, true, {}); + //活动统计 + await accomplishTask(serverId, roleId, TASK_TYPE.GASHA, count) let resultRefFreeTime = 0; if (dicGacha.free.count > 0) { diff --git a/game-server/app/servers/activity/handler/sevenDaysHandler.ts b/game-server/app/servers/activity/handler/sevenDaysHandler.ts index c73484782..f20810048 100644 --- a/game-server/app/servers/activity/handler/sevenDaysHandler.ts +++ b/game-server/app/servers/activity/handler/sevenDaysHandler.ts @@ -12,6 +12,7 @@ import { DailyGiftItem } from '../../../domain/activityField/dailyGiftsField'; import { ActivityDailyGiftsModel } from '../../../db/ActivityDailyGifts'; import { addReward, stringToRewardParam } from '../../../services/giftPackageService'; import { RewardParam } from '../../../domain/activityField/rewardField'; +import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges'; export default function (app: Application) { @@ -156,7 +157,7 @@ export class SevenDaysHandler { * @param {BackendSession} session * @memberof SevenDaysHandler */ - async getDailyChallengesCellReward(msg: { activityId: number, dayIndex: number, cellIndex: number, type: number }, session: BackendSession) { + async getDailyChallengeReward(msg: { activityId: number, dayIndex: number, cellIndex: number, type: number }, session: BackendSession) { const { activityId, dayIndex, cellIndex, type } = msg; const roleId = session.get('roleId'); const serverId = session.get('serverId'); @@ -178,7 +179,7 @@ export class SevenDaysHandler { return resResult(STATUS.ACTIVITY_REWARDED); } - await ActivityGrowthModel.addCellRecord(serverId, activityId, roleId, dayIndex, cellIndex, type, 1, 0); + await ActivityDailyChallengesModel.addCellRecord(serverId, activityId, roleId, dayIndex, cellIndex, type, 1); let rewardParamArr: Array = stringToRewardParam(dailyItemData.reward); let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr) diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts index c32754386..b10763a68 100644 --- a/game-server/app/servers/role/handler/heroHandler.ts +++ b/game-server/app/servers/role/handler/heroHandler.ts @@ -368,6 +368,7 @@ export class HeroHandler { let roleId: string = session.get('roleId'); let sid: string = session.get('sid'); let funcs: number[] = session.get('funcs'); + const serverId = session.get('serverId'); let { hid } = msg; let hero = await HeroModel.findByHidAndRole(hid, roleId); if (!hero) return resResult(STATUS.HERO_NOT_FIND); @@ -396,6 +397,8 @@ export class HeroHandler { // 任务 await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_TRAIN, hero); await checkTask(roleId, sid, funcs, TASK_TYPE.HERO_TRAIN_SUM, 1, true, {}); + //活动统计 + await accomplishTask(serverId, roleId, TASK_TYPE.HERO_TRAIN_SUM, 1) return resResult(STATUS.SUCCESS, { curHero: { hid: hero.hid, job: hero.job, jobStage: hero.jobStage } }); } diff --git a/shared/pubUtils/taskUtil.ts b/shared/pubUtils/taskUtil.ts index 518c597db..52e87c8cc 100644 --- a/shared/pubUtils/taskUtil.ts +++ b/shared/pubUtils/taskUtil.ts @@ -639,6 +639,9 @@ export function isComplete(roleId: string, taskType: TASK_TYPE, taskParam: strin case TASK_TYPE.GUILD_ACTIVITY: addCount = count; break; + case TASK_TYPE.HERO_TRAIN_SUM: + addCount = count; + break; default: addCount = 0; break;