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-26 18:01:47 +08:00
parent ebb9870855
commit d174ac5ff6
22 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app/servers/activity/handler/gachaHandler.ts
View File

@@ -266,7 +266,7 @@ export class GachaHandler {
let heroes: number[] = [];
if (gachaId == GACHA_ID.TIMELIMIT) {
let activityData = await ActivityModel.findActivity(serverId, activityId);
let activityData = await ActivityModel.findActivity(activityId);
if (!activityData) return resResult(STATUS.ACTIVITY_MISSING);
let gachaData = new GachaData(activityData);

2
game-server/app/servers/activity/handler/popUpShopHandler.ts
View File

@@ -51,7 +51,7 @@ export class PopUpShopHandler {
const roleName = session.get('roleName');
const funcs: number[] = session.get('funcs');
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (!activityData) {
return resResult(STATUS.ACTIVITY_MISSING);
}

2
game-server/app/servers/activity/handler/selfServiceShopHandler.ts
View File

@@ -50,7 +50,7 @@ export class SelfServiceShopHandler {
const roleName = session.get('roleName');
const funcs: number[] = session.get('funcs');
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerData = new SelfServiceShopData(activityData);
let item = playerData.getItem(index);

5
game-server/app/servers/activity/handler/thirtyDaysHandler.ts
View File

@@ -8,6 +8,7 @@ import { ActivityThirtyDaysModel } from '../../../db/ActivityThirtyDays';
import { ActivityThirtyDaysPointRewardModel } from '../../../db/ActivityThirtyDaysPointReward';
import moment = require('moment');
import { ActivityModel, ActivityModelType } from '../../../db/Activity';
import { ServerlistModel } from '../../../db/Serverlist';
export default function (app: Application) {
return new ThirtyDaysHandler(app);
@@ -54,8 +55,8 @@ export class ThirtyDaysHandler {
const funcs: number[] = session.get('funcs');
let todayIndex = await playerThirtyDaysActivityDays(roleId);//玩家当前的天数
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS, 1)
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.THIRTY_DAYS, 1)
let activityDays = 0;
for (let i = 0; i < activityArray.length; i++) {