diff --git a/game-server/app/servers/battle/handler/towerBattleHandler.ts b/game-server/app/servers/battle/handler/towerBattleHandler.ts index be12e2329..c41e49927 100644 --- a/game-server/app/servers/battle/handler/towerBattleHandler.ts +++ b/game-server/app/servers/battle/handler/towerBattleHandler.ts @@ -19,7 +19,7 @@ import { pushTowerMsg } from '../../../services/sysChatService'; import { WarStar } from '../../../domain/dbGeneral'; import { RewardInter } from '../../../pubUtils/interface'; import { combineItems } from '../../../services/role/util'; -import { checkTask } from '../../../services/task/taskService'; +import { checkTask, checkTaskInSkipTower } from '../../../services/task/taskService'; import { Rank } from '../../../services/rankService'; export default function(app: Application) { @@ -347,7 +347,7 @@ export class TowerBattleHandler { // 更新redis let r = new Rank(REDIS_KEY.TOWER_RANK, { serverId }); await r.setRankWithRoleInfo(roleId, role.towerLv - 1, role.towerUpTime.getTime(), role); - + await checkTaskInSkipTower(serverId, roleId, sid, role.towerLv - 1); return resResult(STATUS.SUCCESS, { ...data, goods }); } diff --git a/game-server/app/services/task/taskObj.ts b/game-server/app/services/task/taskObj.ts index 7302def49..122bb742e 100644 --- a/game-server/app/services/task/taskObj.ts +++ b/game-server/app/services/task/taskObj.ts @@ -701,7 +701,8 @@ export class CheckSingleTask { { let { warId, count = 1, skipTower } = param; let dicWar = gameData.war.get(warId); - if (dicWar.warType == WAR_TYPE.TOWER || skipTower) { + console.log('##### skipTower', skipTower) + if (skipTower || dicWar.warType == WAR_TYPE.TOWER) { result = { inc: count }; } break; @@ -1224,7 +1225,7 @@ export class CheckSingleTask { { let { warId, count = 1, skipTower } = param; let dicWar = gameData.war.get(warId); - if (dicWar.warType == WAR_TYPE.TOWER || skipTower) { + if (skipTower || dicWar.warType == WAR_TYPE.TOWER ) { result = { inc: count }; } break; diff --git a/shared/db/UserTaskRec.ts b/shared/db/UserTaskRec.ts index f21c9a9af..1a5fa38f2 100644 --- a/shared/db/UserTaskRec.ts +++ b/shared/db/UserTaskRec.ts @@ -62,7 +62,7 @@ export default class UserTaskRec extends BaseModel { public static async recordTaskRec(roleId: string, type: number, taskType: number, group: string, records?: string[]) { let condition = this.getRefreshCondition(type); - let rec: UserTaskRecType = await UserTaskRecModel.findOneAndUpdate({ roleId, group, taskType, ...condition }, { $setOnInsert: { code: genCode(8), received: [] }, $set: { records: records||[] } }, { new: true, upsert: true }).lean(); + let rec: UserTaskRecType = await UserTaskRecModel.findOneAndUpdate({ roleId, group, taskType, ...condition }, { $setOnInsert: { code: genCode(8), received: [], count: 0 }, $set: { records: records||[] } }, { new: true, upsert: true }).lean(); return rec; }