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

活动：弹出礼包

Browse Source
This commit is contained in:
luying
2022-03-15 18:20:29 +08:00
parent 8a6627ea13
commit 319d4cf454
14 changed files with 887 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/popUpShopHandler.ts
+82 -65
View File
@@ -1,7 +1,7 @@
import { Application, BackendSession, HandlerService, } from 'pinus';
import { resResult, splitString } from '../../../pubUtils/util';
import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, STATUS, CURRENCY_TYPE, ITEM_CHANGE_REASON, } from '../../../consts';
import { getPlayerPopUpShopData } from '../../../services/activity/popUpShopService';
import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, STATUS, CURRENCY_TYPE, ITEM_CHANGE_REASON, POP_UP_SHOP_CONDITION_TYPE, } from '../../../consts';
import { checkPopUpCondition, getPopUpShopDataShow } from '../../../services/activity/popUpShopService';
import { ActivityModel, ActivityModelType } from '../../../db/Activity';
import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../../../db/ActivityPopUpShop';
import { PopUpShopData } from '../../../domain/activityField/popUpShopField';
@@ -34,79 +34,96 @@ export class PopUpShopHandler {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await getPlayerPopUpShopData(activityId, serverId, roleId)
let playerData = await getPopUpShopDataShow(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_THIRTY_DAYS_END);
return resResult(STATUS.SUCCESS, { playerData });
}
/**
* @description 购买礼包
* @param {{ activityId: number, id: number, beginTimeStamp: number}} msg
* @param {BackendSession} session
* @memberof PopUpShopHandler
*/
async buyGift(msg: { activityId: number, id: number, beginTimeStamp: number }, session: BackendSession) {
const { activityId, id, beginTimeStamp } = msg;
async checkPopUpCondition(msg: { conditionType: number }, session: BackendSession) {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid = session.get('sid');
const roleName = session.get('roleName');
let beginTime = moment(beginTimeStamp).toDate();
let activityData: ActivityModelType = await getActivityById(activityId);
if (!activityData) {
return resResult(STATUS.ACTIVITY_MISSING);
let { conditionType } = msg;
if(
conditionType != POP_UP_SHOP_CONDITION_TYPE.GACHA_RES_NOT_ENOUGH &&
conditionType != POP_UP_SHOP_CONDITION_TYPE.TERAPH_RES_NOT_ENOUGH
) {
return resResult(STATUS.WRONG_PARMS);
}
let allTaskData: any[] = JSON.parse(activityData.data);
let taskIndex = allTaskData.findIndex(obj => { return obj && obj.id == id });
if (taskIndex == -1) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
await checkPopUpCondition(serverId, roleId, conditionType, {});
let playerData = new PopUpShopData(allTaskData[taskIndex], activityId);
if (playerData.price) {
return resResult(STATUS.ACTIVITY_NEED_PAY);
}
if (playerData.consume) {
return resResult(STATUS.ACTIVITY_NEED_PAY);
}
let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findDataByBeginTime(serverId, activityId, roleId, id, playerData.taskType, beginTime);
if (!playerRecords) {
return resResult(STATUS.ACTIVITY_POP_UP_SHOP_EXPIRE);
}
if (playerRecords.buyCount >= playerData.count) {
return resResult(STATUS.ACTIVITY_MAX_COUNT);
}
if (playerData.condition > playerRecords.totalCount) {
return resResult(STATUS.ACTIVITY_TASK_UNCOMPLETED);
}
//元宝消费
let arr = splitString(playerData.consume, '&')
if (arr[0] != ACTIVITY_RESOURCES_TYPE.GOODS || arr[1] != CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD)) {
return resResult(STATUS.ACTIVITY_GOLD_RESOURCE);
}
let price = arr[2];//数量
let resourceResult = await handleCost(roleId, sid, [{ id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD), count: price }], ITEM_CHANGE_REASON.POP_UP_BUY_GIFT);
if (!resourceResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.reward);
let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr, ITEM_CHANGE_REASON.POP_UP_BUY_GIFT)
await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, id, playerData.taskType, 1, beginTime);
playerData.buyCount += 1;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, id },
item: playerData
}));
return resResult(STATUS.SUCCESS);
}
// /**
// * @description 购买礼包
// * @param {{ activityId: number, id: number, beginTimeStamp: number}} msg
// * @param {BackendSession} session
// * @memberof PopUpShopHandler
// */
// async buyGift(msg: { activityId: number, id: number, beginTimeStamp: number }, session: BackendSession) {
// const { activityId, id, beginTimeStamp } = msg;
// const roleId = session.get('roleId');
// const serverId = session.get('serverId');
// const sid = session.get('sid');
// const roleName = session.get('roleName');
// let beginTime = moment(beginTimeStamp).toDate();
// let activityData: ActivityModelType = await getActivityById(activityId);
// if (!activityData) {
// return resResult(STATUS.ACTIVITY_MISSING);
// }
// let allTaskData: any[] = JSON.parse(activityData.data);
// let taskIndex = allTaskData.findIndex(obj => { return obj && obj.id == id });
// if (taskIndex == -1) {
// return resResult(STATUS.ACTIVITY_DATA_ERROR);
// }
// let playerData = new PopUpShopData(allTaskData[taskIndex], activityId);
// if (playerData.price) {
// return resResult(STATUS.ACTIVITY_NEED_PAY);
// }
// if (playerData.consume) {
// return resResult(STATUS.ACTIVITY_NEED_PAY);
// }
// let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findDataByBeginTime(serverId, activityId, roleId, id, playerData.taskType, beginTime);
// if (!playerRecords) {
// return resResult(STATUS.ACTIVITY_POP_UP_SHOP_EXPIRE);
// }
// if (playerRecords.buyCount >= playerData.count) {
// return resResult(STATUS.ACTIVITY_MAX_COUNT);
// }
// if (playerData.condition > playerRecords.totalCount) {
// return resResult(STATUS.ACTIVITY_TASK_UNCOMPLETED);
// }
// //元宝消费
// let arr = splitString(playerData.consume, '&')
// if (arr[0] != ACTIVITY_RESOURCES_TYPE.GOODS || arr[1] != CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD)) {
// return resResult(STATUS.ACTIVITY_GOLD_RESOURCE);
// }
// let price = arr[2];//数量
// let resourceResult = await handleCost(roleId, sid, [{ id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD), count: price }], ITEM_CHANGE_REASON.POP_UP_BUY_GIFT);
// if (!resourceResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
// let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.reward);
// let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr, ITEM_CHANGE_REASON.POP_UP_BUY_GIFT)
// await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, id, playerData.taskType, 1, beginTime);
// playerData.buyCount += 1;
// return resResult(STATUS.SUCCESS, Object.assign(result, {
// param: { activityId, id },
// item: playerData
// }));
// }
}
game-server/app/services/activity/activityService.ts
+10 -3
View File
@@ -12,7 +12,7 @@ import { getPlayerActivityData, } from './selfServiceShopActivityService';
import { ActivitySelfServiceGoodsModel } from '../../db/ActivitySelfServiceGoods';
import moment = require('moment');
import { getPlayerTreasureHuntData, getTreasureHuntData } from './treasureHuntService';
import { getPlayerPopUpShopData } from './popUpShopService';
import { getPopUpShopDataShow } from './popUpShopService';
import { getPlayerSevenDaysData } from './sevenDaysService';
import { getPlayerDailyMealData } from './dailyMealService';
import { getPlayerDailyCoinData } from './dailyCoinService';
@@ -36,9 +36,10 @@ import { getPlayerLuckyTurntableDataShow } from './luckyTurntableService';
import { getTimeLimitRankDataShow } from './timeLimitRankService';
import { ActivityTaskPointModel } from '../../db/ActivityTaskPoint';
import { getRoleOnlineInfo } from '../redisService';
import { addTaskPassPoint } from './taskPassService';
import { addTaskPassPoint, getTaskPassDataShow } from './taskPassService';
import { getGuildChannelSid } from '../chatService';
import { getGuildPayDataShow } from './guildPayService';
import { PopUpShopItemShow } from '../../domain/activityField/popUpShopField';
/**
* 获取活动数据
@@ -127,7 +128,7 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
}
case ACTIVITY_TYPE.POP_UP_SHOP://弹出商店 24
{
activityData = await getPlayerPopUpShopData(activityId, serverId, roleId);
activityData = await getPopUpShopDataShow(activityId, serverId, roleId);
break;
}
case ACTIVITY_TYPE.VIP_RECHARGE_MONEY://vip累计充值活动 26
@@ -202,6 +203,11 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
activityData = await getTimeLimitRankDataShow(activityId);
break;
}
case ACTIVITY_TYPE.TASK_PASS: // 限时排行
{
activityData = await getTaskPassDataShow(activityId, serverId, roleId);
break;
}
case ACTIVITY_TYPE.GUILD_PAY:
{
activityData = await getGuildPayDataShow(serverId, activityId, roleId, guildCode);
@@ -366,6 +372,7 @@ interface pushActivityParamInter {
payMemberCnt?: number; // 军团充值活动，你的军团充值的人数
payMember?: string; // 军团充值活动，充值人员名字，添加到payRecord里面
payRecord?: string[]; // 军团全部充值人名字
popUpShopItems?: PopUpShopItemShow[]; // 弹出礼包
}
export interface pushActivityInter {
game-server/app/services/activity/popUpShopService.ts
+77 -67
View File
@@ -1,33 +1,14 @@
import { ACTIVITY_TYPE, ITEM_CHANGE_REASON, STATUS } from '../../consts';
import { ACTIVITY_TYPE, ITEM_CHANGE_REASON, POP_UP_SHOP_CONDITION_TYPE, STATUS } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { PopUpShopData, } from '../../domain/activityField/popUpShopField';
import { PopShopItem, PopUpConditionParamInter, PopUpShopData, PopUpShopPackage, PopUpShopItemShow, } from '../../domain/activityField/popUpShopField';
import { RewardParam } from '../../domain/activityField/rewardField';
import { addReward, stringToRewardParam } from './giftPackageService';
import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../../db/ActivityPopUpShop';
import { ActivityPopUpShopModel, ActivityPopUpShopModelType, PopUpShopItem } from '../../db/ActivityPopUpShop';
import { ServerlistModel } from '../../db/Serverlist';
import moment = require('moment');
import { getActivityById } from './activityService';
/**
* 获取活动数据
*
* @param {number} serverId 区Id
* @param {number} type 活动类型 ACTIVITY_TYPE
* @param {string} roleId 角色Id
*
*/
export async function popUpShopActivity(serverId: number, roleId: string) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.POP_UP_SHOP, new Date())
if (activityArray.length == 0) {
return null;
}
let activityData = activityArray[0];
let playerData = await getPlayerPopUpShopData(activityData.activityId, serverId, roleId);
return playerData
}
import { getActivitiesByType, getActivityById, pushActivities, pushActivityInter, pushSingleActivity } from './activityService';
import { RoleModel, RoleType } from '../../db/Role';
import { HeroType } from '../../db/Hero';
/**
* 玩家活动数据
@@ -37,28 +18,74 @@ export async function popUpShopActivity(serverId: number, roleId: string) {
* @param {string} roleId 角色Id
*
*/
export async function getPlayerPopUpShopData(activityId: number, serverId: number, roleId: string) {
let activityData = await getActivityById(activityId);
let playerRecords: ActivityPopUpShopModelType[] = await ActivityPopUpShopModel.findAllOpenData(serverId, activityId, roleId);
export async function getPopUpShopData(activityId: number, serverId: number, roleId: string, role?: RoleType) {
if(!role) role = await RoleModel.findByRoleId(roleId, 'roleId totalPay');
let allPlayerShop = [];
let allTaskData = JSON.parse(activityData.data);
for (let record of playerRecords) {
if (record.isPush) {//没有购买
let index = allTaskData.findIndex(obj => { return obj && obj.id === record.id && obj.taskType === record.type })
if (index != -1) {
let playerData = new PopUpShopData(allTaskData[index], activityData.activityId);
playerData.setPlayerRecords(record)
if (playerData.buyCount < allTaskData[index].count) {
allPlayerShop.push(playerData)
let activityData = await getActivityById(activityId);
let playerRecords = await ActivityPopUpShopModel.findAllEffectData(serverId, activityId, roleId);
let latestRecords = await ActivityPopUpShopModel.findAllLastData(serverId, activityId, roleId);
let playerData = new PopUpShopData(activityData);
playerData.setPlayerRecords(playerRecords, latestRecords, role.totalPay);
return playerData;
}
export async function getPopUpShopDataShow(activityId: number, serverId: number, roleId: string, role?: RoleType) {
let playerData = await getPopUpShopData(activityId, serverId, roleId, role);
if(playerData && playerData.canShow && playerData.canShow()) {
return playerData.getShowResult();
}
return null
}
export async function checkPopUpConditionInCreateHero(serverId, roleId, heroes: HeroType[]) {
let conditions = heroes.map(hero => ({ conditionType: POP_UP_SHOP_CONDITION_TYPE.GET_HERO_BY_QUALITY, param: { quality: hero.quality } }));
return await checkPopUpConditions(serverId, roleId, conditions);
}
export async function checkPopUpCondition(serverId: number, roleId: string, conditionType: POP_UP_SHOP_CONDITION_TYPE, param: PopUpConditionParamInter) {
return await checkPopUpConditions(serverId, roleId, [{ conditionType, param }]);
}
// 弹出礼包任务
export async function checkPopUpConditions(serverId: number, roleId: string, conditions: { conditionType: POP_UP_SHOP_CONDITION_TYPE, param: PopUpConditionParamInter }[]) {
let activities = await getActivitiesByType(serverId, ACTIVITY_TYPE.POP_UP_SHOP);
let pushData: pushActivityInter[] = [];
for(let { activityId, type: activityType } of activities) {
let playerData = await getPopUpShopData(activityId, serverId, roleId);
let pushItems: PopUpShopItemShow[] = [];
for(let { conditionType, param } of conditions) {
for(let pkg of playerData.packages) {
console.log('##### 3', pkg.id, pkg.checkPackageCanPush(conditionType))
if( !pkg.checkPackageCanPush(conditionType)) { // 筛选推送
continue;
}
let items = pkg.getItemsByCondition(param);
console.log('##### 4', items, items.length)
if(items.length > 0) {
let popUpShopRec = await ActivityPopUpShopModel.createRecord({
serverId, activityId, roleId, id: pkg.id,
...pkg.getEffectTime(),
items: items.map(item => new PopUpShopItem(item))
});
let result = pkg.pushPackage(popUpShopRec);
pushItems.push(...result);
}
}
}
console.log('##### 5', pushItems.length)
if(pushItems.length > 0) {
pushData.push({ activityId, activityType, param: { popUpShopItems: pushItems } });
}
}
allPlayerShop['canShow'] = () => true;
return allPlayerShop;
console.log('##### 6', pushData.length)
await pushActivities(pushData, roleId);
}
/**
* 结算购买礼包的奖励
*
@@ -69,49 +96,32 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
*
*/
export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number,
activityId: number, productID: string, paramStr: string) {
activityId: number, productID: string, paramStr: string, roleInfo: RoleType) {
if (!paramStr) {
return STATUS.ORDER_PARAM_ERROR;
}
let paramObj = JSON.parse(paramStr);
let beginTime = moment(paramObj.beginTimeStamp).toDate();
let code = paramObj.code;
let activityData: ActivityModelType = await getActivityById(activityId);
if (!activityData) {
let playerData = await getPopUpShopData(activityId, serverId, roleId, roleInfo);
if (!playerData) {
return STATUS.ACTIVITY_MISSING;
}
if (activityData.type !== ACTIVITY_TYPE.POP_UP_SHOP) {
if (playerData.type !== ACTIVITY_TYPE.POP_UP_SHOP) {
return STATUS.ACTIVITY_TYPE_ERROR;
}
let allTaskData: any[] = JSON.parse(activityData.data);
let taskIndex = allTaskData.findIndex(obj => { return obj && obj.productID == productID });
if (taskIndex == -1) {
return STATUS.ACTIVITY_NO_PRODUCT;
}
let playerData = new PopUpShopData(allTaskData[taskIndex], activityId);
let playerRecord: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findDataByBeginTime(serverId, activityId, roleId, playerData.id, playerData.taskType, beginTime);
let playerRecord: ActivityPopUpShopModelType = await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, code, productID);
if (!playerRecord) {
return STATUS.APPLY_ORDER_ERROR;
}
let curDate = new Date();
if (curDate < playerRecord.beginTime || curDate > playerRecord.endTime) {
return STATUS.ACTIVITY_POP_UP_SHOP_CLOSED;
}
if (playerRecord.totalCount < playerData.condition) {
return STATUS.ACTIVITY_TASK_UNCOMPLETED;
}
if (playerRecord.buyCount >= playerData.count) {
return STATUS.ACTIVITY_REWARDED;
}
playerRecord = await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, playerData.id, playerData.taskType, 1, beginTime);
playerData.setPlayerRecords(playerRecord);
let item = playerData.updateRecord(playerRecord, productID);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.reward);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr, ITEM_CHANGE_REASON.POP_UP_BUY_GIFT)
return {
code: 0,
data: Object.assign(result, { item: playerData, activityId: activityData.activityId })
data: Object.assign(result, { item: item, activityId })
}
}
game-server/app/services/gmService.ts
+21 -20
View File
@@ -251,10 +251,11 @@ export function getActivityProducts(activity: ActivityModelType) {
case ACTIVITY_TYPE.POP_UP_SHOP://弹出礼包
{
let products: { label: string, value: string }[] = [];
let allTaskData: any[] = JSON.parse(activity.data);
for(let task of allTaskData) {
let data = new PopUpShopData(task, activity.activityId);
products.push(getDicRMB(data.productID))
let data = new PopUpShopData(activity);
for(let { items } of data.packages) {
for(let item of items) {
products.push(getDicRMB(item.productID));
}
}
return products;
}
@@ -299,23 +300,23 @@ export async function getParamStr(activity: ActivityModelType, productID: string
let task = allTaskData.find(cur => cur.productID == productID);
if(!task) break;
let playerRecords = await ActivityPopUpShopModel.findAllOpenData(role.serverId, activity.activityId, role.roleId);
let playerRecord: ActivityPopUpShopModelType;
for(let record of playerRecords) {
let playerData = new PopUpShopData(task, activity.activityId);
playerData.setPlayerRecords(record);
if (record && playerData.buyCount < task.count) {
playerRecord = record; break;
}
}
console.log('####', playerRecord, task)
if(!playerRecord) {
let beginTime = new Date();
let endTime = moment(new Date()).add(task.duration, 'h').toDate();
playerRecord = await ActivityPopUpShopModel.addTaskPushMessage(role.serverId, activity.activityId, role.roleId, task.id, task.taskType, task.condition, beginTime, endTime);
}
// let playerRecords = await ActivityPopUpShopModel.findAllOpenData(role.serverId, activity.activityId, role.roleId);
// let playerRecord: ActivityPopUpShopModelType;
// for(let record of playerRecords) {
// let playerData = new PopUpShopData(task, activity.activityId);
// playerData.setPlayerRecords(record);
// if (record && playerData.buyCount < task.count) {
// playerRecord = record; break;
// }
// }
// console.log('####', playerRecord, task)
// if(!playerRecord) {
// let beginTime = new Date();
// let endTime = moment(new Date()).add(task.duration, 'h').toDate();
// playerRecord = await ActivityPopUpShopModel.addTaskPushMessage(role.serverId, activity.activityId, role.roleId, task.id, task.taskType, task.condition, beginTime, endTime);
// }
param['beginTimeStamp'] = playerRecord.beginTime.getTime();
// param['beginTimeStamp'] = playerRecord.beginTime.getTime();
break;
case ACTIVITY_TYPE.REFRESH_SHOP:
let { activityGroupId } = await ServerlistModel.findByServerId(role.serverId);
game-server/app/services/normalBattleService.ts
+4 -1
View File
@@ -4,7 +4,7 @@ import Role, { RoleModel, RoleType } from '../db/Role'
import { getLvByExp, getExpByLv, gameData, getDicApByLv } from '../pubUtils/data';
import { updateUserInfo } from './redisService';
// import { switchOnFunc } from './funcSwitchService';
import { FUNC_OPT_TYPE, TASK_TYPE, WAR_TYPE, STATUS, KING_EXP_RATIO_TYPE, ITEM_CHANGE_REASON } from '../consts';
import { FUNC_OPT_TYPE, TASK_TYPE, WAR_TYPE, STATUS, KING_EXP_RATIO_TYPE, ITEM_CHANGE_REASON, POP_UP_SHOP_CONDITION_TYPE } from '../consts';
import { BackendSession, pinus } from 'pinus';
import { REDIS_KEY } from '../consts';
import { Rank } from './rankService';
@@ -16,6 +16,7 @@ import { resResult } from '../pubUtils/util';
import { LineupParam } from '../domain/rank';
import { WarStar } from '../domain/dbGeneral';
import { uniq } from 'underscore';
import { checkPopUpCondition } from './activity/popUpShopService';
export async function roleLevelup(type: KING_EXP_RATIO_TYPE, roleId: string, kingExp: number = 0, session: BackendSession) {
const serverId = session.get('serverId');
@@ -47,6 +48,8 @@ export async function roleLevelup(type: KING_EXP_RATIO_TYPE, roleId: string, kin
await checkTask(roleId, session.get('sid'), TASK_TYPE.ROLE_LV, newLv, false, {});
//成长任务
await checkActivityTask(serverId, session.get('sid'), roleId, TASK_TYPE.ROLE_LV, newLv);
// 弹出礼包
await checkPopUpCondition(serverId, roleId, POP_UP_SHOP_CONDITION_TYPE.LV_TO, { oldLv: lv, newLv })
}
let actordata: { lv: number, exp: number, getExp: number, mostExp: number }[] = [];
game-server/app/services/orderService.ts
+1 -1
View File
@@ -88,7 +88,7 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) {
}
case ACTIVITY_TYPE.POP_UP_SHOP://弹出礼包
{
rewardResult = await makePopUpShopReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID, orderInfo.paramStr)
rewardResult = await makePopUpShopReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID, orderInfo.paramStr, roleInfo)
break;
}
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP: //主线成长基金（高阶）
game-server/app/services/rewardService.ts
+4 -1
View File
@@ -1,4 +1,4 @@
import { ITID, CONSUME_TYPE, ITEM_TABLE, CURRENCY, CURRENCY_TYPE, MAIL_TYPE, HANDLE_REWARD_TYPE, HERO_SYSTEM_TYPE, CURRENCY_BY_TYPE, ITEM_CHANGE_REASON, TA_USERSET_TYPE, TA_EVENT } from './../consts';
import { ITID, CONSUME_TYPE, ITEM_TABLE, CURRENCY, CURRENCY_TYPE, MAIL_TYPE, HANDLE_REWARD_TYPE, HERO_SYSTEM_TYPE, CURRENCY_BY_TYPE, ITEM_CHANGE_REASON, TA_USERSET_TYPE, TA_EVENT, POP_UP_SHOP_CONDITION_TYPE } from './../consts';
import { getRandSingleEelm, resResult } from '../pubUtils/util';
import { RoleModel, RoleType } from '../db/Role';
import { setAp } from './actionPointService';
@@ -27,6 +27,7 @@ import { reportTAEvent, reportTAUserSet } from './sdkService';
import { saveCoinChangeLog, saveFigureInfoLog, saveGoldChangeLog, saveItemChangeLog } from '../pubUtils/logUtil';
import { JewelModel, JewelType } from '../db/Jewel';
import { updateEplaces } from './equipService';
import { checkPopUpConditionInCreateHero } from './activity/popUpShopService';
export class CheckMeterial {
private roleId: string;
@@ -604,6 +605,8 @@ export async function createHeroes(roleId: string, roleName: string, sid: string
await createHero.updateRedisRank(Rank);
heroes = createHero.getShowHeroes();
resultHeroes = createHero.getResultHeroes();
await checkPopUpConditionInCreateHero(serverId, roleId, resultHeroes);
}
if (pieces.length > 0) {