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
game-server/app/servers/activity/handler/firstGiftHandler.ts
+11 -11
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 },
game-server/app/servers/activity/handler/thirtyDaysHandler.ts
+1 -4
View File
@@ -55,10 +55,7 @@ export class ThirtyDaysHandler {
let todayIndex = await playerThirtyDaysActivityDays(roleId);//玩家当前的天数
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS, true)
activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId
});
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS, 1)
let activityDays = 0;
for (let i = 0; i < activityArray.length; i++) {
game-server/app/services/dailyRMBGiftsService.ts
+2 -4
View File
@@ -18,10 +18,8 @@ import { addReward, stringToRewardParam } from './giftPackageService';
*/
export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId
});
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
let allPlayerActivity = [];
for (let i = 0; i < activityArray.length; i++) {
let activityData = activityArray[i];
game-server/app/services/firstGiftService.ts
+11 -7
View File
@@ -1,7 +1,7 @@
import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../db/ActivityFirstGift';
import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftField';
import { FirstGiftData } from '../domain/activityField/firstGiftField';
/**
* 获取活动数据
@@ -13,16 +13,20 @@ import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftF
*/
export async function firstGiftActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, true)
activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId
});
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, 1)
if (activityArray.length == 0) {
return null;
}
let activityData = activityArray[0];
let playerData = await getPlayerFirstGiftData(activityData.activityId, serverId, roleId);
return playerData
let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityData.activityId, roleId);
if (playerRecord.isOver) {
return true;
}
let playerData = new FirstGiftData(activityData);
playerData.setPlayerRecords(playerRecord);
return playerData;
}
/**
game-server/app/services/growthFundService.ts
+2 -4
View File
@@ -22,10 +22,8 @@ import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFu
GROWTH_FUND_MAIN_ELITE_VIP = 11, // 精英成长基金（高阶）
*/
export async function growthFundActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId
});
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
for (let i = 0; i < activityArray.length; i++) {
let activityData = activityArray[i];
let playerData = await getPlayerGrowthFundData(activityData.activityId, serverId, roleId);
game-server/app/services/orderService.ts
+11
View File
@@ -9,6 +9,8 @@ import { makeMonthlyTicketReward } from './monthlyTicketService';
import { makeSignInVIP } from './signInService';
import { makeDailyRMBGiftsReward } from './dailyRMBGiftsService';
import { makePopUpShopReward } from './popUpShopService';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityFirstGiftModel } from '../db/ActivityFirstGift';
@@ -39,6 +41,15 @@ export async function makeOrder(localOrderID: string, sid: string) {
const roleInfo = await RoleModel.findByRoleId(roleId);
//首冲礼包
{
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(orderInfo.serverId, ACTIVITY_TYPE.FIRST_GIFT, new Date())
for (let obj of activityArray) {
await ActivityFirstGiftModel.begin(obj.activityId, roleId);
}
}
switch (productType) {
case ACTIVITY_TYPE.SIGN_IN_VIP:
{
game-server/app/services/thirtyDaysService.ts
+2 -4
View File
@@ -18,10 +18,8 @@ import { deltaDays } from '../pubUtils/util';
*/
export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId
});
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
let allPlayerActivity = [];
for (let i = 0; i < activityArray.length; i++) {
let activityData = activityArray[i];
game-server/app/services/yuanbaoService.ts
+1 -4
View File
@@ -15,10 +15,7 @@ import { addReward, stringToRewardParam } from './giftPackageService';
*/
export async function yuanbaoActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.YUAN_BAO_SHOP, true)
activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId
});
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.YUAN_BAO_SHOP, -1)
if (activityArray.length == 0) {
return null;
}