任务:任务去除funcs的判断,直接达成
This commit is contained in:
@@ -38,7 +38,7 @@ export class PvpHandler {
|
||||
let { heroScores: addHeroScores } = msg;
|
||||
let roleId = session.get('roleId');
|
||||
let sid = session.get('sid');
|
||||
const funcs: number[] = session.get('funcs');
|
||||
|
||||
let { heroScores, hisScore } = await PvpDefenseModel.findByRoleId(roleId);
|
||||
let score = 0;
|
||||
for (let { hid, score: heroScore } of addHeroScores) {
|
||||
@@ -69,7 +69,7 @@ export class PvpHandler {
|
||||
await r.setRankWithRoleInfo(roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), role);
|
||||
|
||||
// 任务
|
||||
await checkTask(roleId, sid, funcs, TASK_TYPE.PVP_HERO_SCORE, 0, false, { heroScores });
|
||||
await checkTask(roleId, sid, TASK_TYPE.PVP_HERO_SCORE, 0, false, { heroScores });
|
||||
|
||||
return resResult(STATUS.SUCCESS, { score, hisScore, heroScores });
|
||||
}
|
||||
@@ -239,7 +239,7 @@ export class PvpHandler {
|
||||
let roleId = session.get('roleId');
|
||||
let roleName = session.get('roleName');
|
||||
let sid = session.get('sid');
|
||||
const funcs: number[] = session.get('funcs');
|
||||
|
||||
const serverId = session.get('serverId');
|
||||
|
||||
const { battleCode, isSuccess, myHeroes, oppHeroes } = msg;
|
||||
@@ -307,11 +307,11 @@ export class PvpHandler {
|
||||
await r.setRankWithRoleInfo(roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), role);
|
||||
let myRank = await r.getMyRank({ roleId });
|
||||
|
||||
await checkTaskInPvpEnd(roleId, sid, funcs, isSuccess, heroScores);
|
||||
await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.PVP, 1)
|
||||
await checkTaskInPvpEnd(roleId, sid, isSuccess, heroScores);
|
||||
await checkActivityTask(serverId, sid, roleId, TASK_TYPE.PVP, 1)
|
||||
if (isSuccess) {
|
||||
await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.PVP_WIN, 1)
|
||||
await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.PVP_WIN_SERIES, 1)
|
||||
await checkActivityTask(serverId, sid, roleId, TASK_TYPE.PVP_WIN, 1)
|
||||
await checkActivityTask(serverId, sid, roleId, TASK_TYPE.PVP_WIN_SERIES, 1)
|
||||
}
|
||||
|
||||
return resResult(STATUS.SUCCESS, {
|
||||
@@ -485,7 +485,7 @@ export class PvpHandler {
|
||||
let roleId = session.get('roleId');
|
||||
let sid: string = session.get('sid');
|
||||
let roleName = session.get('roleName');
|
||||
const funcs: number[] = session.get('funcs');
|
||||
|
||||
let { seasonEndTime } = await PVPConfigModel.findCurPVPConfig();
|
||||
let { hisScore, receivedBox, challengeCnt: lastChallengeCnt, challengeRefTime: lastChallengeRefTime } = await PvpDefenseModel.findByRoleIdIncludeAll(roleId);
|
||||
let pvpBoxs = getPvpBoxs();
|
||||
@@ -501,7 +501,7 @@ export class PvpHandler {
|
||||
await PvpDefenseModel.updateInfo(roleId, { receivedBox, challengeCnt, challengeRefTime });
|
||||
let result = await addItems(roleId, roleName, sid, pvpBox.reward);
|
||||
// 任务
|
||||
await checkTask(roleId, sid, funcs, TASK_TYPE.PVP_RECEIVE_BOX, 1, true, {});
|
||||
await checkTask(roleId, sid, TASK_TYPE.PVP_RECEIVE_BOX, 1, true, {});
|
||||
return resResult(STATUS.SUCCESS, { goods: result, receivedBox, challengeCnt, challengeRefTime });
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user