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-05-20 17:16:01 +08:00
parent 14acc426a0
commit afc95d2e19
10 changed files with 119 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/growthService.ts
+1 -1
View File
@@ -25,7 +25,7 @@ export async function getActivityData(activityId: number, serverId: number, role
*/
export async function getPlayerGrowthData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let playerRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(activityId, roleId);
let playerRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
let playerData = new GrowthData(activityData);
playerData.setPlayerRecords(playerRecords);
game-server/app/services/popUpShopService.ts
+12 -14
View File
@@ -1,7 +1,7 @@
import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityDailyRMBGiftsModel, ActivityDailyRMBGiftsModelType } from '../db/ActivityDailyRMBGifts';
import { PopUpShopData, PopUpShopItem } from '../domain/activityField/PopUpSHopField';
import { PopUpShopData, } from '../domain/activityField/PopUpSHopField';
import { RoleModel } from '../db/Role';
import moment = require('moment');
import { UserOrderModel, UserOrderModelType } from '../db/UserOrder';
@@ -45,14 +45,15 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
let allPlayerShop = [];
let allTaskData = JSON.parse(activityData.data);
for (let taskData of allTaskData) {
let playerData = new PopUpShopData(taskData);
let taskId = playerData.taskId;
let index = playerRecords.findIndex(obj => { return obj && obj.taskId == taskId });
if (index != -1) {
playerData.setPlayerRecords(playerRecords[index])
for (let record of playerRecords) {
if (!record.isBuy) {//没有购买
let index = allTaskData.findIndex(obj => { return obj && obj.id === record.id })
if (index != -1) {
let playerData = new PopUpShopData(allTaskData[index]);
playerData.isBuy == false;
allPlayerShop.push(playerData)
}
}
allPlayerShop.push(playerData)
}
return allPlayerShop;
}
@@ -78,15 +79,12 @@ export async function makePopUpShopReward(roleId: string, roleName: string, sid:
return null;
}
let playerData = new PopUpShopData(allTaskData[taskIndex]);
let taskId = playerData.taskId;
let item = playerData.findItemByProductID(productID);
let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, taskId, item.id);
let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, playerData.id);
if (!playerRecords) {
return null;
}
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
return result
}
}