活动:每日兑换铜币活动
This commit is contained in:
@@ -22,6 +22,8 @@ import { checkActivityTask } from '../../../services/taskService';
|
||||
import { treasureHuntActivity } from '../../../services/treasureHuntService';
|
||||
import { getSelfServiceShopActivityData } from '../../../services/selfServiceShopActivityService';
|
||||
import { ActivitySelfServiceGoodsModel } from '../../../db/ActivitySelfServiceGoods';
|
||||
import { dailyMealActivity } from '../../../services/dailyMealService';
|
||||
import { dailyCoinActivity } from '../../../services/dailyCoinService';
|
||||
// import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
|
||||
// import { isComplete } from '../../../pubUtils/taskUtil';
|
||||
|
||||
@@ -440,17 +442,29 @@ export class ActivityHandler {
|
||||
}
|
||||
}
|
||||
|
||||
// //每日领取免费午饭、晚饭活动
|
||||
// {
|
||||
// let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.DAILY_MEAL);
|
||||
// if (data) {
|
||||
// playerActivityArray.push({
|
||||
// type: ACTIVITY_TYPE.DAILY_MEAL,
|
||||
// activityId: data.activityId,
|
||||
// data,
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
//每日领取免费午饭、晚饭活动
|
||||
{
|
||||
let data = await dailyMealActivity(serverId, roleId);
|
||||
if (data) {
|
||||
playerActivityArray.push({
|
||||
type: ACTIVITY_TYPE.DAILY_MEAL,
|
||||
activityId: data.activityId,
|
||||
data,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
//每日兑换铜币活动
|
||||
{
|
||||
let data = await dailyCoinActivity(serverId, roleId);
|
||||
if (data) {
|
||||
playerActivityArray.push({
|
||||
type: ACTIVITY_TYPE.DAILY_COIN,
|
||||
activityId: data.activityId,
|
||||
data,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return resResult(STATUS.SUCCESS, { playerActivityArray });
|
||||
}
|
||||
|
||||
106
game-server/app/servers/activity/handler/dailyCoinHandler.ts
Normal file
106
game-server/app/servers/activity/handler/dailyCoinHandler.ts
Normal file
@@ -0,0 +1,106 @@
|
||||
import { Application, BackendSession } from 'pinus';
|
||||
import { resResult } from '../../../pubUtils/util';
|
||||
import { STATUS } from '../../../consts';
|
||||
import { handleCost } from '../../../services/rewardService';
|
||||
import { getPlayerDailyCoinData, mergeData } from '../../../services/dailyCoinService';
|
||||
import { DailyCoinItem } from '../../../domain/activityField/dailyCoinField';
|
||||
import { ActivityDailyCoinModel } from '../../../db/ActivityDailyCoin';
|
||||
import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService';
|
||||
import { RewardParam } from '../../../domain/activityField/rewardField';
|
||||
import { ItemInter } from '../../../pubUtils/interface';
|
||||
|
||||
|
||||
export default function (app: Application) {
|
||||
return new DailyCoinHandler(app);
|
||||
}
|
||||
|
||||
export class DailyCoinHandler {
|
||||
constructor(private app: Application) {
|
||||
}
|
||||
|
||||
|
||||
/************************每日兑换铜币****************************/
|
||||
|
||||
/**
|
||||
* @description 获取每日铜币活动数据
|
||||
* @param {{ activityId: number}} msg
|
||||
* @param {BackendSession} session
|
||||
* @memberof DailyCoinHandler
|
||||
*/
|
||||
async getDailyCoinActivity(msg: { activityId: number }, session: BackendSession) {
|
||||
const { activityId } = msg;
|
||||
const roleId = session.get('roleId');
|
||||
const serverId = session.get('serverId');
|
||||
|
||||
let playerData = await getPlayerDailyCoinData(activityId, serverId, roleId)
|
||||
|
||||
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
|
||||
|
||||
return resResult(STATUS.SUCCESS, playerData);
|
||||
}
|
||||
|
||||
/**
|
||||
* @description 兑换
|
||||
* @param {{ activityId: number, count:number}} msg
|
||||
* @param {BackendSession} session
|
||||
* @memberof DailyCoinHandler
|
||||
*/
|
||||
async exchangeCoin(msg: { activityId: number, count: number }, session: BackendSession) {
|
||||
const { activityId, count } = msg;
|
||||
const roleId = session.get('roleId');
|
||||
const serverId = session.get('serverId');
|
||||
const sid = session.get('sid');
|
||||
const roleName = session.get('roleName');
|
||||
const funcs = session.get('funcs');
|
||||
|
||||
let playerData = await getPlayerDailyCoinData(activityId, serverId, roleId)
|
||||
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
|
||||
let curIndex = playerData.exchangeCount;
|
||||
if (curIndex + count > playerData.list.length) {
|
||||
return resResult(STATUS.ACTIVITY_MAX_COUNT);
|
||||
}
|
||||
let allConsume: Array<ItemInter> = []
|
||||
let allReward: Array<RewardParam> = [];
|
||||
for (let i = 1; i <= count; i++) {
|
||||
let index = curIndex + i;
|
||||
console.log('第几次抽奖', index)
|
||||
let item: DailyCoinItem = playerData.findItem(index);
|
||||
if (item.consume) {//消耗资源
|
||||
let consume = stringToConsumeParam(item.consume)
|
||||
allConsume = allConsume.concat(consume)
|
||||
}
|
||||
let rate = item.getRate()//翻几倍
|
||||
let baseRewardParamArr: Array<RewardParam> = stringToRewardParam(item.baseReward);
|
||||
console.log('基础奖励翻倍', JSON.stringify(baseRewardParamArr), rate)
|
||||
for (let reward of baseRewardParamArr) {
|
||||
reward.count = reward.count * rate;
|
||||
}
|
||||
allReward = allReward.concat(baseRewardParamArr);
|
||||
if (item.extraReward) {//额外奖励
|
||||
let extraRewardParamArr: Array<RewardParam> = stringToRewardParam(item.extraReward);
|
||||
console.log('额外奖励', JSON.stringify(extraRewardParamArr))
|
||||
allReward = allReward.concat(extraRewardParamArr);
|
||||
}
|
||||
}
|
||||
|
||||
let newConsume = mergeData(allConsume);
|
||||
let newReward = mergeData(allReward);
|
||||
console.log('所有消耗', JSON.stringify(newConsume))
|
||||
console.log('所有奖励', JSON.stringify(newReward))
|
||||
|
||||
//检查资源
|
||||
let consumeResult = await handleCost(roleId, sid, newConsume);
|
||||
if (!consumeResult) return resResult(STATUS.ACTIVITY_RES_NOT_ENOUGH);
|
||||
|
||||
//免费期间
|
||||
let result = await addReward(roleId, roleName, sid, serverId, funcs, newReward)
|
||||
await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.beginTime, count);
|
||||
|
||||
let exchangeCount = playerData.exchangeCount + count;
|
||||
return resResult(STATUS.SUCCESS, Object.assign(result, {
|
||||
param: { activityId, count },
|
||||
item: { exchangeCount },
|
||||
}));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -11,10 +11,10 @@ import moment = require('moment');
|
||||
|
||||
|
||||
export default function (app: Application) {
|
||||
return new DailyLunchHandler(app);
|
||||
return new DailyMealHandler(app);
|
||||
}
|
||||
|
||||
export class DailyLunchHandler {
|
||||
export class DailyMealHandler {
|
||||
constructor(private app: Application) {
|
||||
}
|
||||
|
||||
@@ -25,9 +25,9 @@ export class DailyLunchHandler {
|
||||
* @description 获取每日午饭/晚饭活动数据
|
||||
* @param {{ activityId: number}} msg
|
||||
* @param {BackendSession} session
|
||||
* @memberof DailyLunchHandler
|
||||
* @memberof DailyMealHandler
|
||||
*/
|
||||
async getDailyLunchActivity(msg: { activityId: number }, session: BackendSession) {
|
||||
async getDailyMealActivity(msg: { activityId: number }, session: BackendSession) {
|
||||
const { activityId } = msg;
|
||||
const roleId = session.get('roleId');
|
||||
const serverId = session.get('serverId');
|
||||
@@ -43,7 +43,7 @@ export class DailyLunchHandler {
|
||||
* @description 领取奖励
|
||||
* @param {{ activityId: number}} msg
|
||||
* @param {BackendSession} session
|
||||
* @memberof DailyLunchHandler
|
||||
* @memberof DailyMealHandler
|
||||
*/
|
||||
async getDailyMealReward(msg: { activityId: number, type: number }, session: BackendSession) {
|
||||
const { activityId, type } = msg;
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
import { Application, BackendSession } from 'pinus';
|
||||
import { decodeArrayListStr, deltaDays, resResult, splitString } from '../../../pubUtils/util';
|
||||
import { STATUS, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE } from '../../../consts';
|
||||
import { SelfServiceShopData, SelfServiceShopItem, SelfServiceShopItemInfo } from '../../../domain/activityField/selfServiceShopField';
|
||||
import { addItems, handleCost } from '../../../services/rewardService';
|
||||
import { resResult, splitString } from '../../../pubUtils/util';
|
||||
import { STATUS, } from '../../../consts';
|
||||
import { SelfServiceShopData } from '../../../domain/activityField/selfServiceShopField';
|
||||
import { handleCost } from '../../../services/rewardService';
|
||||
import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '../../../db/ActivitySelfServiceShop';
|
||||
import { ActivitySelfServiceModel, ActivitySelfServiceModelType } from '../../../db/ActivitySelfService';
|
||||
import { ActivitySelfServiceGoodsModel, ActivitySelfServiceGoodsModelType } from '../../../db/ActivitySelfServiceGoods';
|
||||
import moment = require('moment');
|
||||
import Activity, { ActivityModel, ActivityModelType } from '../../../db/Activity';
|
||||
import { ActivitySelfServiceModel } from '../../../db/ActivitySelfService';
|
||||
import { ActivitySelfServiceGoodsModel } from '../../../db/ActivitySelfServiceGoods';
|
||||
import { ActivityModel, ActivityModelType } from '../../../db/Activity';
|
||||
import { addSelfServiceShopGiftReward, getSelfServiceShopActivityData, getPlayerActivityData } from '../../../services/selfServiceShopActivityService';
|
||||
import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService';
|
||||
import { random } from 'underscore';
|
||||
@@ -73,17 +72,17 @@ export class SelfServiceShopHandler {
|
||||
let consumeResult = await handleCost(roleId, sid, consume);
|
||||
if (!consumeResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
|
||||
|
||||
let result = await addSelfServiceShopGiftReward(roleId, roleName, sid, serverId, funcs, activityId, roundIndex, index);
|
||||
let result = await addSelfServiceShopGiftReward(roleId, roleName, sid, serverId, funcs, activityId, roundIndex, index, item);
|
||||
return resResult(STATUS.SUCCESS, Object.assign(result, {}));
|
||||
}
|
||||
|
||||
/**
|
||||
* @description 操作礼包
|
||||
* @param {{ data:Array<{activityId: number, roundIndex: number, index: number, cellIndex: number, gift: number, rewardIndex: number}>}} msg
|
||||
* @param {{ data:Array<{activityId: number, roundIndex: number, index: number, cellIndex: number, rewardIndex: number}>}} msg
|
||||
* @param {BackendSession} session
|
||||
* @memberof SelfServiceShopHandler
|
||||
*/
|
||||
async saveGood(msg: { data: Array<{ activityId: number, roundIndex: number, index: number, cellIndex: number, gift: number, rewardIndex: number }> }, session: BackendSession) {
|
||||
async saveGood(msg: { data: Array<{ activityId: number, roundIndex: number, index: number, cellIndex: number, rewardIndex: number }> }, session: BackendSession) {
|
||||
const { data } = msg;
|
||||
const roleId = session.get('roleId');
|
||||
const serverId = session.get('serverId');
|
||||
@@ -92,7 +91,7 @@ export class SelfServiceShopHandler {
|
||||
const funcs: number[] = session.get('funcs');
|
||||
|
||||
for (let obj of data) {
|
||||
await ActivitySelfServiceGoodsModel.addGoods(obj.activityId, roleId, obj.roundIndex, obj.index, obj.cellIndex, obj.gift, obj.rewardIndex);
|
||||
await ActivitySelfServiceGoodsModel.addGoods(obj.activityId, roleId, obj.roundIndex, obj.index, obj.cellIndex, obj.rewardIndex);
|
||||
}
|
||||
|
||||
return resResult(STATUS.SUCCESS, { data });
|
||||
|
||||
Reference in New Issue
Block a user