活动:节日活动添加每日关卡
This commit is contained in:
@@ -11,6 +11,15 @@ import { getPlayerThirtyDaysData, playerThirtyDaysActivityDays, } from './thirty
|
||||
import { getPlayerVipRechargeMoneyData, } from './vipRechargeMoneyService';
|
||||
import { getPlayerActivityData, } from './selfServiceShopActivityService';
|
||||
import { ActivitySelfServiceGoodsModel } from '../db/ActivitySelfServiceGoods';
|
||||
import { RoleModel } from '../db/Role';
|
||||
import moment = require('moment');
|
||||
import { getPlayerTreasureHuntData, getTreasureHuntData } from './treasureHuntService';
|
||||
import { getPlayerPopUpShopData } from './popUpShopService';
|
||||
import { getPlayerSevenDaysData } from './sevenDaysService';
|
||||
import { getPlayerDailyMealData } from './dailyMealService';
|
||||
import { getPlayerDailyCoinData } from './dailyCoinService';
|
||||
import { getPlayerDailyRMBGiftsData } from './dailyRMBGiftsService';
|
||||
import { getPlayerDailyGKData } from './dailyGKService';
|
||||
|
||||
/**
|
||||
* 获取活动数据
|
||||
@@ -59,6 +68,16 @@ export async function getActivity(serverId: number, roleId: string, activityId:
|
||||
activityData = await getPlayerFirstGiftData(activityId, serverId, roleId);
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE://新手限定RMB购买礼包 15
|
||||
{
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let createDate = moment(createTime * 1000).toDate();
|
||||
let endTime = moment(createDate).startOf('d').add(7, 'd').add(5, 'h').toDate();
|
||||
if (new Date() <= endTime) {
|
||||
activityData = await getPlayerLimitPackageData(activityId, serverId, roleId);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_DAILY://每日限购礼包,RMB购买礼包 16
|
||||
case ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_WEEKLY://每周限购礼包,RMB购买礼包 17
|
||||
{
|
||||
@@ -83,7 +102,18 @@ export async function getActivity(serverId: number, roleId: string, activityId:
|
||||
}
|
||||
case ACTIVITY_TYPE.DAILY_RMB_GIFTS://每日特惠RMB购买,一次性购买7天礼包 22
|
||||
{
|
||||
activityData = await getPlayerDailyGiftsData(activityId, serverId, roleId);
|
||||
activityData = await getPlayerDailyRMBGiftsData(activityId, serverId, roleId);
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.TREASURE_HUNT://寻宝骑兵活动 23
|
||||
{
|
||||
let { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex } = await getTreasureHuntData(serverId);
|
||||
activityData = await getPlayerTreasureHuntData(activityId, serverId, roleId, huntRoundIndex, huntBeginTime, huntEndTime);
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.POP_UP_SHOP://弹出商店 24
|
||||
{
|
||||
activityData = await getPlayerPopUpShopData(activityId, serverId, roleId);
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.VIP_RECHARGE_MONEY://vip累计充值活动 26
|
||||
@@ -91,6 +121,32 @@ export async function getActivity(serverId: number, roleId: string, activityId:
|
||||
activityData = await getPlayerVipRechargeMoneyData(activityId, serverId, roleId);
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.SEVEN_DAY://七天乐活动 27
|
||||
case ACTIVITY_TYPE.FOURTEEN_DAY://十四天乐活动 28
|
||||
case ACTIVITY_TYPE.COMMON_SEVEN_DAY://通用七天乐活动 29
|
||||
{
|
||||
activityData = await getPlayerSevenDaysData(activityId, serverId, roleId);
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.DAILY_MEAL://每日领取免费午饭、晚饭活动 30
|
||||
{
|
||||
activityData = await getPlayerDailyMealData(activityId, serverId, roleId);
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.DAILY_COIN://每日兑换铜币活动 31
|
||||
{
|
||||
activityData = await getPlayerDailyCoinData(activityId, serverId, roleId);
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.DAILY_GK://每日关卡(每日开启一关) 32
|
||||
{
|
||||
activityData = await getPlayerDailyGKData(activityId, serverId, roleId);
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
console.log('未知活动类型.........')
|
||||
break;
|
||||
}
|
||||
}
|
||||
return activityData;
|
||||
}
|
||||
|
||||
72
game-server/app/services/dailyGKService.ts
Normal file
72
game-server/app/services/dailyGKService.ts
Normal file
@@ -0,0 +1,72 @@
|
||||
import { ACTIVITY_TYPE } from '../consts';
|
||||
import { ActivityModel, ActivityModelType } from '../db/Activity';
|
||||
import { ActivityDailyGKModel, ActivityDailyGKModelType } from '../db/ActivityDailyGK';
|
||||
import { ServerlistModel } from '../db/Serverlist';
|
||||
import { DailyGKData, DailyGKItem } from '../domain/activityField/dailyGKField';
|
||||
|
||||
|
||||
/**
|
||||
* 获取活动数据
|
||||
*
|
||||
* @param {number} serverId 区Id
|
||||
* @param {number} activityId 活动Id
|
||||
* @param {string} roleId 角色Id
|
||||
*
|
||||
*/
|
||||
export async function dailyGKActivity(serverId: number, roleId: string) {
|
||||
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
|
||||
let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.DAILY_GK, new Date());
|
||||
if (activityDataArray.length === 0) {
|
||||
return null;
|
||||
}
|
||||
let activityData: ActivityModelType = activityDataArray[0];
|
||||
let playerRecord: ActivityDailyGKModelType = await ActivityDailyGKModel.findData(serverId, activityData.activityId, roleId);
|
||||
let playerData = new DailyGKData(activityData);
|
||||
playerData.setPlayerRecords(playerRecord);
|
||||
return playerData;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 玩家玩家活动数据
|
||||
*
|
||||
* @param {number} serverId 区Id
|
||||
* @param {number} activityId 活动Id
|
||||
* @param {string} roleId 角色Id
|
||||
*
|
||||
*/
|
||||
export async function getPlayerDailyGKData(activityId: number, serverId: number, roleId: string) {
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
|
||||
let playerRecord: ActivityDailyGKModelType = await ActivityDailyGKModel.findData(serverId, activityId, roleId);
|
||||
|
||||
let playerData = new DailyGKData(activityData);
|
||||
playerData.setPlayerRecords(playerRecord);
|
||||
|
||||
return playerData;
|
||||
}
|
||||
|
||||
/**
|
||||
* 挑战每日关卡成功
|
||||
*
|
||||
* @param {number} activityId 活动id
|
||||
* @param {number} gk 关卡id
|
||||
*
|
||||
*/
|
||||
export async function challengeDailyGK(serverId: number, roleId: string, activityId: number, gk: number) {
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
|
||||
|
||||
let playerData = new DailyGKData(activityData);
|
||||
let item = playerData.findItemByGK(gk);
|
||||
if (item) {
|
||||
let dayIndex = item.dayIndex;
|
||||
await ActivityDailyGKModel.addRecord(serverId, activityId, roleId, dayIndex);
|
||||
} else {
|
||||
console.log('没有找到对应关卡活动数据', activityId, gk)
|
||||
}
|
||||
|
||||
return playerData;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ export async function dailyRMBGiftsActivity(serverId: number, roleId: string) {
|
||||
return null;
|
||||
}
|
||||
let activityData = activityArray[0];
|
||||
let playerData = await getPlayerDailyGiftsData(activityData.activityId, serverId, roleId);
|
||||
let playerData = await getPlayerDailyRMBGiftsData(activityData.activityId, serverId, roleId);
|
||||
return playerData
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ export async function dailyRMBGiftsActivity(serverId: number, roleId: string) {
|
||||
* @param {string} roleId 角色Id
|
||||
*
|
||||
*/
|
||||
export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
|
||||
export async function getPlayerDailyRMBGiftsData(activityId: number, serverId: number, roleId: string) {
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
|
||||
|
||||
let playerData = new DailyRMBGiftsData(activityData);
|
||||
|
||||
Reference in New Issue
Block a user