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

活动：首冲活动添加查询是否结束相关逻辑

Browse Source
This commit is contained in:
qiaoxin
2021-05-24 17:37:33 +08:00
parent 7976956721
commit 9b5f145082
12 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
game-server/app/servers/activity/handler/firstGiftHandler.ts
View File

@@ -1,7 +1,7 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { FIRST_GIFT_STATE, STATUS } from '../../../consts';
import { firstGiftActivity, getPlayerFirstGiftData } from '../../../services/firstGiftService';
import { getPlayerFirstGiftData } from '../../../services/firstGiftService';
import { RoleModel } from '../../../db/Role';
import { addReward, stringToRewardParam, useGiftPackage } from '../../../services/giftPackageService';
import { ActivityFirstGiftModel } from '../../../db/ActivityFirstGift';
@@ -16,18 +16,19 @@ export class FirstGiftHandler {
/************************首充礼包****************************/
/**
/**首冲活动按玩家注册时间
* 不充，首充活动就一直在那里
* @description 获取首充礼包数据
* @param {{ }} msg
* @param {{ activityId: number, }} msg
* @param {BackendSession} session
* @memberof FirstGiftHandler
*/
async getFirstGiftActivity(msg: {}, session: BackendSession) {
const { } = msg;
async getFirstGiftActivity(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await firstGiftActivity(serverId, roleId);
let playerData = await getPlayerFirstGiftData(activityId, serverId, roleId);
if (!playerData) {
return resResult(STATUS.ACTIVITY_MISSING);
}
@@ -58,12 +59,9 @@ export class FirstGiftHandler {
if (!playerData) {
return resResult(STATUS.ACTIVITY_MISSING);
}
if (playerData.state === FIRST_GIFT_STATE.NOT_OPEN) {
if (playerData.state === FIRST_GIFT_STATE.CLOSED) {
return resResult(STATUS.ACTIVITY_FIRST_GIFT_NOT_OPEN);
} else if (playerData.state === FIRST_GIFT_STATE.CLOSED) {
return resResult(STATUS.ACTIVITY_FIRST_GIFT_END);
}
let items = playerData.canReceiveItems();
if (items.length === 0) {
return resResult(STATUS.ACTIVITY_REWARDED);
@@ -77,7 +75,9 @@ export class FirstGiftHandler {
}
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray);
await ActivityFirstGiftModel.addRecord(activityId, roleId, indexArray);
let isOver = playerData.isComplete();
await ActivityFirstGiftModel.addRecord(activityId, roleId, indexArray, isOver);
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId },