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-06-15 17:37:53 +08:00
parent 347adafbd3
commit 4851c699b6
4 changed files with 102 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/dailyCoinHandler.ts
+29 -12
View File
@@ -1,13 +1,15 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { CURRENCY_BY_TYPE, CURRENCY_TYPE, STATUS } from '../../../consts';
import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, STATUS } from '../../../consts';
import { handleCost } from '../../../services/rewardService';
import { getPlayerDailyCoinData, mergeData } from '../../../services/dailyCoinService';
import { DailyCoinItem } from '../../../domain/activityField/dailyCoinField';
import { ConsumeExchangeFormulaItem, CoinRewardFormulaItem } 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';
import { getGoldObject } from '../../../pubUtils/itemUtils';
import { RoleModel } from '../../../db/Role';
export default function (app: Application) {
@@ -36,7 +38,6 @@ export class DailyCoinHandler {
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
delete playerData.list;
return resResult(STATUS.SUCCESS, playerData);
}
@@ -57,28 +58,36 @@ export class DailyCoinHandler {
let playerData = await getPlayerDailyCoinData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let curIndex = playerData.exchangeCount;
if (curIndex + count > playerData.list.length) {
if (curIndex + count > playerData.countMax) {
return resResult(STATUS.ACTIVITY_MAX_COUNT);
}
let allConsume: Array<ItemInter> = []
let allReward: Array<RewardParam> = [];
let role = await RoleModel.findByRoleId(roleId)
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)
if (index > playerData.freeCount) {//消耗资源
let consumeItem: ConsumeExchangeFormulaItem = playerData.findConsumeExchangeFormulaItem(index);
let times = index;
let consumeCount = eval(consumeItem.consumeFormula)
let consume = getGoldObject(consumeCount)
allConsume = allConsume.concat(consume)
}
let rate = item.getRate()//翻几倍
let baseRewardParamArr: Array<RewardParam> = stringToRewardParam(item.baseReward);
let rate = playerData.getRate()//翻几倍
let rewardItem: CoinRewardFormulaItem = playerData.findCoinRewardFormulaItem(index);
let lv = role.lv;//玩家等级
let coinRewardCount = eval(rewardItem.rewardFormula);
let baseRewardParamArr: Array<RewardParam> = [{ id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.COIN), count: coinRewardCount, type: ACTIVITY_RESOURCES_TYPE.GOODS }];
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);
if (playerData.isExtra(index)) {//额外奖励
let extraRewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.extraReward);
console.log('额外奖励', JSON.stringify(extraRewardParamArr))
allReward = allReward.concat(extraRewardParamArr);
}
@@ -101,9 +110,17 @@ export class DailyCoinHandler {
}
}
let consumeGold = 0;
let goldId = CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD);
for (let obj of newConsume) {
if (obj.id === goldId) {
consumeGold += obj.count;
}
}
//免费期间
let result = await addReward(roleId, roleName, sid, serverId, funcs, newReward)
await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.beginTime, count, addCoin);
await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.beginTime, count, addCoin, `${count}&${consumeGold}&${addCoin}`);
let exchangeCount = playerData.exchangeCount + count;
return resResult(STATUS.SUCCESS, Object.assign(result, {