xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务：镇念塔无法碾压达成

Browse Source
This commit is contained in:
luying
2022-05-07 21:12:46 +08:00
parent f84f41fe00
commit d1115fb5d0
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
game-server/app/servers/battle/handler/towerBattleHandler.ts
View File

@@ -19,7 +19,7 @@ import { pushTowerMsg } from '../../../services/sysChatService';
import { WarStar } from '../../../domain/dbGeneral'; import { WarStar } from '../../../domain/dbGeneral';
import { RewardInter } from '../../../pubUtils/interface'; import { RewardInter } from '../../../pubUtils/interface';
import { combineItems } from '../../../services/role/util'; import { combineItems } from '../../../services/role/util';
import { checkTask } from '../../../services/task/taskService'; import { checkTask, checkTaskInSkipTower } from '../../../services/task/taskService';
import { Rank } from '../../../services/rankService'; import { Rank } from '../../../services/rankService';
export default function(app: Application) { export default function(app: Application) {
@@ -347,7 +347,7 @@ export class TowerBattleHandler {
// 更新redis // 更新redis
let r = new Rank(REDIS_KEY.TOWER_RANK, { serverId }); let r = new Rank(REDIS_KEY.TOWER_RANK, { serverId });
await r.setRankWithRoleInfo(roleId, role.towerLv - 1, role.towerUpTime.getTime(), role); 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 }); return resResult(STATUS.SUCCESS, { ...data, goods });
} }

5
game-server/app/services/task/taskObj.ts
View File

@@ -701,7 +701,8 @@ export class CheckSingleTask {
{ {
let { warId, count = 1, skipTower } = param; let { warId, count = 1, skipTower } = param;
let dicWar = gameData.war.get(warId); 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 }; result = { inc: count };
} }
break; break;
@@ -1224,7 +1225,7 @@ export class CheckSingleTask {
{ {
let { warId, count = 1, skipTower } = param; let { warId, count = 1, skipTower } = param;
let dicWar = gameData.war.get(warId); let dicWar = gameData.war.get(warId);
if (dicWar.warType == WAR_TYPE.TOWER || skipTower) { if (skipTower || dicWar.warType == WAR_TYPE.TOWER ) {
result = { inc: count }; result = { inc: count };
} }
break; break;

2
shared/db/UserTaskRec.ts
View File

@@ -62,7 +62,7 @@ export default class UserTaskRec extends BaseModel {
public static async recordTaskRec(roleId: string, type: number, taskType: number, group: string, records?: string[]) { public static async recordTaskRec(roleId: string, type: number, taskType: number, group: string, records?: string[]) {
let condition = this.getRefreshCondition(type); 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; return rec;
} }