活动：战令
This commit is contained in:
luying
@@ -21,12 +21,12 @@ import { getPlayerDailyGKData } from './dailyGKService';
|
||||
import { getPlayerRefreshShopData } from './refreshShopService';
|
||||
import { getPlayerRefreshTaskData } from './refreshTaskService';
|
||||
import { getPlayerMonopolyData } from './monopolyService';
|
||||
import { getPlayerNewHeroGiftsData } from './newHeroGiftsService';
|
||||
import { getPlayerNewHeroGiftsData, newHeroGiftPoint } from './newHeroGiftsService';
|
||||
import { getPlayerNewHeroGKData } from './newHeroGKService';
|
||||
import { getPlayerNewHeroGachaData } from './newHeroGachaService';
|
||||
import { pinus } from 'pinus';
|
||||
import { BackendSession, pinus } from 'pinus';
|
||||
import { ActivityModel, ActivityModelType } from '../../db/Activity';
|
||||
import { getRandSingleEelm } from '../../pubUtils/util';
|
||||
import { getRandSingleEelm, resResult } from '../../pubUtils/util';
|
||||
import { SignInData } from '../../domain/activityField/signInField';
|
||||
import { ActivityGroupModel } from '../../db/ActivityGroup';
|
||||
import { ActivityGroupTypeModel } from '../../db/ActivityGroupType';
|
||||
@@ -34,6 +34,9 @@ import { ServerlistModel } from '../../db/Serverlist';
|
||||
import { ActivityInRemote, transActivityInRemoteToModelType } from '../../domain/activityField/activityField';
|
||||
import { getPlayerLuckyTurntableDataShow } from './luckyTurntableService';
|
||||
import { getTimeLimitRankDataShow } from './timeLimitRankService';
|
||||
import { ActivityTaskPointModel } from '../../db/ActivityTaskPoint';
|
||||
import { getRoleOnlineInfo } from '../redisService';
|
||||
import { addTaskPassPoint } from './taskPassService';
|
||||
|
||||
/**
|
||||
* 获取活动数据
|
||||
@@ -315,11 +318,65 @@ export async function checkActivityGroupType(groupType: number, activities: Acti
|
||||
let index = dic.findIndex(cur => cur.activityType == type);
|
||||
if(index == -1) {
|
||||
return false;
|
||||
} else {
|
||||
dic.splice(index, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* 达成任务可活动活动积分
|
||||
* @param type 任务类型，主线、每日、成就
|
||||
* @param id
|
||||
* @param point
|
||||
* @param session
|
||||
*/
|
||||
export async function addActvityTaskPoint(type: number, id: number, session: BackendSession) {
|
||||
let serverId: number = session.get('serverId');
|
||||
let roleId: string = session.get('roleId');
|
||||
let sid: string = session.get('sid');
|
||||
let activityTaskPoint = await ActivityTaskPointModel.findData(type, id);
|
||||
let result: pushActivityInter[] = [];
|
||||
for (let { activityId, activityType, point } of activityTaskPoint) {
|
||||
console.log('##### activityTaskPoint:', activityId, activityType, point)
|
||||
if(activityType == ACTIVITY_TYPE.NEW_HERO_GIFTS) { // 新武将活动
|
||||
let totalPoint = await newHeroGiftPoint(serverId, activityId, roleId, point);
|
||||
result.push({ activityId, activityType, param: { totalPoint } });
|
||||
} else if (activityType == ACTIVITY_TYPE.TASK_PASS) {
|
||||
let totalPoint = await addTaskPassPoint(serverId, activityId, roleId, point);
|
||||
result.push({ activityId, activityType, param: { totalPoint } });
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
await pushActivities(result, roleId, sid);
|
||||
}
|
||||
|
||||
|
||||
interface pushActivityParamInter {
|
||||
ticketCnt?: number; // 木签活动的签数(type21)
|
||||
totalPoint?: number; // 新将好礼（type37）和战令（type42）更新后的积分
|
||||
}
|
||||
|
||||
export interface pushActivityInter {
|
||||
activityId: number,
|
||||
activityType: number,
|
||||
param: pushActivityParamInter;
|
||||
}
|
||||
|
||||
export async function pushSingleActivity(activityId: number, activityType: number, param: pushActivityParamInter, roleId: string, sid?: string) {
|
||||
await pushActivities([{ activityId, activityType, param }], roleId, sid);
|
||||
}
|
||||
|
||||
export async function pushActivities(arr: pushActivityInter[], roleId: string, sid?: string) {
|
||||
if(!sid) {
|
||||
let onlineUser = await getRoleOnlineInfo(roleId);
|
||||
sid = onlineUser.sid;
|
||||
}
|
||||
pinus.app.get('channelService').pushMessageByUids('onActivityUpdate',
|
||||
resResult(STATUS.SUCCESS, {
|
||||
activities: arr
|
||||
}),
|
||||
[{ uid: roleId, sid }]);
|
||||
}
|
||||
@@ -54,5 +54,6 @@ export async function getPlayerNewHeroGiftsData(activityId: number, serverId: nu
|
||||
*
|
||||
*/
|
||||
export async function newHeroGiftPoint(serverId: number, activityId: number, roleId: string, addPoint: number) {
|
||||
await ActivityNewHeroGiftModel.addPoint(serverId, activityId, roleId, addPoint);
|
||||
let result = await ActivityNewHeroGiftModel.addPoint(serverId, activityId, roleId, addPoint);
|
||||
return result.totalPoint;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,9 @@ import { ActivityRechargeMoneyModel, ActivityRechargeMoneyModelType } from '../.
|
||||
import { RechargeMoneyData } from '../../domain/activityField/rechargeMoneyField';
|
||||
import moment = require('moment');
|
||||
import { RoleModel } from '../../db/Role';
|
||||
import { getActivityById } from './activityService';
|
||||
import { getActivitiesByType, getActivityById, pushActivities, pushActivityInter } from './activityService';
|
||||
import { ACTIVITY_TYPE } from '../../consts';
|
||||
import { getRoleOnlineInfo } from '../redisService';
|
||||
|
||||
/**
|
||||
* 玩家活动数据
|
||||
@@ -43,6 +45,19 @@ export async function getPlayerRechargeMoneyDataShow(activityId: number, serverI
|
||||
export async function addRechargeMoney(roleId: string, serverId: number, RMB: number) {
|
||||
let beginTime = moment(new Date()).startOf('d').toDate();
|
||||
let endTime = moment(new Date()).endOf('d').toDate();
|
||||
await ActivityRechargeMoneyModel.addRMB(serverId, roleId, RMB, beginTime, endTime);
|
||||
let result = await ActivityRechargeMoneyModel.addRMB(serverId, roleId, RMB, beginTime, endTime);
|
||||
if(result.RMB == RMB) { // 获得木签的时候推送给在线玩家
|
||||
let onlineUser = await getRoleOnlineInfo(roleId);
|
||||
if(!!onlineUser.sid) {
|
||||
let result: pushActivityInter[] = [];
|
||||
let activities = await getActivitiesByType(serverId, ACTIVITY_TYPE.RECHARGE_MONEY);
|
||||
for(let { activityId, type: activityType } of activities) {
|
||||
let playerData = await getPlayerRechargeMoneyData(activityId, serverId, roleId);
|
||||
result.push({ activityId, activityType, param: { ticketCnt: playerData.ticketCnt } });
|
||||
}
|
||||
|
||||
await pushActivities(result, roleId, onlineUser.sid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
import { ACTIVITY_TYPE, STATUS } from "../../consts";
|
||||
import { ActivityModelType } from "../../db/Activity";
|
||||
import { ActivityTaskPassModel } from "../../db/ActivityTaskPass";
|
||||
import { RoleModel } from "../../db/Role";
|
||||
import { TaskPassData } from "../../domain/activityField/taskPassField";
|
||||
import { getActivityById } from "./activityService";
|
||||
|
||||
export async function getTaskPassData(activityId: number, serverId: number, roleId: string) {
|
||||
let activityData = await getActivityById(activityId);
|
||||
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new TaskPassData(activityData, createTime);
|
||||
let record = await ActivityTaskPassModel.findData(serverId, activityId, roleId, playerData.roundIndex);
|
||||
|
||||
playerData.setPlayerRecord(record);
|
||||
|
||||
return playerData;
|
||||
}
|
||||
|
||||
export async function getTaskPassDataShow(activityId: number, serverId: number, roleId: string) {
|
||||
let playerData = await getTaskPassData(activityId, serverId, roleId);
|
||||
if(playerData && playerData.canShow && playerData.canShow()) {
|
||||
return playerData.getShowResult();
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 购买高级战令
|
||||
*
|
||||
* @param {number} serverId 区Id
|
||||
* @param {number} activityId 活动Id
|
||||
* @param {string} roleId 角色Id
|
||||
* @param {string} productID 商品ID
|
||||
*
|
||||
*/
|
||||
export async function makeTaskPass(roleId: string, roleName: string, sid: string, serverId: number, activityId: number, productID: string) {
|
||||
let activityData: ActivityModelType = await getActivityById(activityId);
|
||||
if (!activityData) {
|
||||
return STATUS.ACTIVITY_MISSING;
|
||||
}
|
||||
if (activityData.type !== ACTIVITY_TYPE.TASK_PASS) {
|
||||
return STATUS.ACTIVITY_TYPE_ERROR;
|
||||
}
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new TaskPassData(activityData, createTime);
|
||||
let roundIndex = playerData.roundIndex;
|
||||
await ActivityTaskPassModel.buy(serverId, activityId, roleId, roundIndex, productID);
|
||||
return {
|
||||
code: 0,
|
||||
data: Object.assign({}, { item: { roundIndex }, activityId: activityId })
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 任务活动完成后会获得点数
|
||||
*
|
||||
* @param {number} serverId 区Id
|
||||
* @param {number} activityId 活动Id
|
||||
* @param {string} roleId 角色Id
|
||||
*
|
||||
*/
|
||||
export async function addTaskPassPoint(serverId: number, activityId: number, roleId: string, addPoint: number) {
|
||||
let activity = await getActivityById(activityId);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let data = new TaskPassData(activity, createTime);
|
||||
let result = await ActivityTaskPassModel.addPoint(serverId, activityId, roleId, data.roundIndex, addPoint);
|
||||
return result.totalPoint;
|
||||
}
|
||||
@@ -29,6 +29,7 @@ import { PayCallback37Data } from '../domain/sdk';
|
||||
import { reportTAEvent, reportTAUserSet } from './sdkService';
|
||||
import { savePayLog } from '../pubUtils/logUtil';
|
||||
import { recordFirstGift } from './activity/firstGiftService';
|
||||
import { makeTaskPass } from './activity/taskPassService';
|
||||
|
||||
|
||||
/**
|
||||
@@ -131,6 +132,12 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) {
|
||||
rewardResult = await makeRefreshShopReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID, 0)
|
||||
break;
|
||||
}
|
||||
case ACTIVITY_TYPE.TASK_PASS: // 战令-高级卡
|
||||
{
|
||||
rewardResult = await makeTaskPass(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID)
|
||||
break;
|
||||
|
||||
}
|
||||
default:
|
||||
rewardResult = STATUS.ERROR_TYPE;
|
||||
break;
|
||||
@@ -171,8 +178,8 @@ export async function settleOrder(order: UserOrderModelType, serverId: number, s
|
||||
}), [{ uid: order.roleId, sid }]);
|
||||
}
|
||||
//活动统计
|
||||
await addRechargeMoney(order.roleId, serverId, order.price);
|
||||
await addVipRechargeMoney(order.roleId, serverId, order.price);
|
||||
addRechargeMoney(order.roleId, serverId, order.price);
|
||||
addVipRechargeMoney(order.roleId, serverId, order.price);
|
||||
//成长任务
|
||||
await checkActivityTask(serverId, sid, order.roleId, TASK_TYPE.ACTIVITY_RMB, order.price, { activityId: order.activityId });
|
||||
if(order.payType != PAY_TYPE.TEST) {
|
||||
|
||||
@@ -93,7 +93,7 @@ export async function pushActivityUpdate(roleId: string, sid: string, pushMessag
|
||||
}
|
||||
if (!!sid) {
|
||||
let uids = [{ uid: roleId, sid }];
|
||||
pinus.app.get('channelService').pushMessageByUids('onActivityUpdate', resResult(STATUS.SUCCESS, pushMessage), uids);
|
||||
pinus.app.get('channelService').pushMessageByUids('onActivityTaskUpdate', resResult(STATUS.SUCCESS, pushMessage), uids);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user