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

活动：每日挑战添加服务器id

Browse Source
This commit is contained in:
qiaoxin
2021-05-20 18:41:37 +08:00
parent a2dc4c6239
commit d637e5701d
8 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/sevenDaysHandler.ts
+18 -22
View File
@@ -179,17 +179,15 @@ export class SevenDaysHandler {
}
await ActivityGrowthModel.addCellRecord(serverId, activityId, roleId, dayIndex, cellIndex, type, 1, 0);
let reward = dailyItemData.goodReward();
let goods = await addItems(roleId, roleName, sid, reward);
let heroReward = dailyItemData.heroReward();
let addHeros = [];
if (heroReward.length > 0) {
let heroResult = await createHeroes(roleId, roleName, sid, serverId, funcs, heroReward);
goods = goods.concat(heroResult.goods)
addHeros = addHeros.concat(heroResult.heroes);
}
return resResult(STATUS.SUCCESS, { goods, addHeros });
let rewardParamArr: Array<RewardParam> = stringToRewardParam(dailyItemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
dailyItemData.receiveRewardCount = 1;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: msg,
item: dailyItemData,
}));
}
@@ -249,21 +247,19 @@ export class SevenDaysHandler {
let result = await handleCost(roleId, sid, [{ id: consumeData.id, count: consumeData.count }]);
if (!result) return resResult(STATUS.ACTIVITY_RES_NOT_ENOUGH);
} else if (consumeType == ACTIVITY_RESOURCES_TYPE.RMB) {//RMB购买
return resResult(STATUS.ACTIVITY_NEED_PAY);
}
await ActivityDailyGiftsModel.buyRecord(activityId, roleId, dayIndex, cellIndex, 1);
let reward = dailyItemData.goodReward();
let goods = await addItems(roleId, roleName, sid, reward);
let heroReward = dailyItemData.heroReward();
let addHeros = [];
if (heroReward.length > 0) {
let heroResult = await createHeroes(roleId, roleName, sid, serverId, funcs, heroReward);
goods = goods.concat(heroResult.goods)
addHeros = addHeros.concat(heroResult.heroes);
}
await ActivityDailyGiftsModel.buyRecord(serverId, activityId, roleId, dayIndex, cellIndex, 1);
return resResult(STATUS.SUCCESS, { goods, addHeros });
let rewardParamArr: Array<RewardParam> = stringToRewardParam(dailyItemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
dailyItemData.buyCount += 1;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: msg,
item: dailyItemData,
}));
}
}
game-server/app/services/dailyChallengesService.ts
+1 -1
View File
@@ -13,7 +13,7 @@ import { DailyChallengesData, DailyItem } from '../domain/activityField/dailyCha
*/
export async function getPlayerDailyChallengesData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(activityId, roleId);
let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
let playerData = new DailyChallengesData(activityData);
playerData.setPlayerRecords(playerRecords);
game-server/app/services/dailyGiftsService.ts
+1 -1
View File
@@ -13,7 +13,7 @@ import { DailyGiftsData, DailyGiftItem } from '../domain/activityField/dailyGift
*/
export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(activityId, roleId);
let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
let playerData = new DailyGiftsData(activityData);
playerData.setPlayerRecords(playerRecords);