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

活动：任务接口添加serverId接口

Browse Source
This commit is contained in:
qiaoxin
2021-05-20 19:25:52 +08:00
parent d637e5701d
commit 718f19a42a
39 changed files with 481 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/popUpShopService.ts
+3 -3
View File
@@ -15,7 +15,7 @@ import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../db/Activi
*/
export async function popUpShopActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.POP_UP_SHOP, new Date())
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.POP_UP_SHOP, new Date())
activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId
});
@@ -36,7 +36,7 @@ export async function popUpShopActivity(serverId: number, roleId: string) {
*
*/
export async function getPlayerPopUpShopData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityPopUpShopModelType[] = await ActivityPopUpShopModel.findAllOpenData(serverId, activityId, roleId);
let allPlayerShop = [];
@@ -65,7 +65,7 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
*/
export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
if (!activityData) {
return null;
}