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

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

@@ -74,7 +74,7 @@ export class GachaHandler {
let userGacha = await UserGachaModel.findByRole(roleId, gachaId, activityId);
let { floor, freeCount, hope, point, pickHero, refFreeTime, count: historyCount } = await refreshGacha(dicGacha, userGacha);
if((gachaId == GACHA_ID.ASSIGN|| gachaId == GACHA_ID.TIMELIMIT) && !pickHero) return resResult(STATUS.GACHA_NOT_ASSIGN);
if ((gachaId == GACHA_ID.ASSIGN || gachaId == GACHA_ID.TIMELIMIT) && !pickHero) return resResult(STATUS.GACHA_NOT_ASSIGN);
let userHeroes = await HeroModel.findByRole(roleId);
@@ -155,7 +155,7 @@ export class GachaHandler {
for (let { hid } of hope) {
let dicHero = gameData.hero.get(hid);
if(hid != 0) {
if (hid != 0) {
if (!dicHero) return resResult(STATUS.DIC_DATA_NOT_FOUND);
if (hid != 0 && dicHero.quality != HERO_QUALITY_TYPE.GOLD) {
return resResult(STATUS.GACHA_HOPE_NOT_GOLD);
@@ -255,6 +255,7 @@ export class GachaHandler {
async setPickHero(msg: { gachaId: number, activityId: number, pickHero: number }, session: BackendSession) {
const { gachaId, activityId = 0, pickHero } = msg;
const roleId: string = session.get('roleId');
const serverId: number = session.get('serverId');
if (gachaId != GACHA_ID.ASSIGN && gachaId != GACHA_ID.TIMELIMIT)
return resResult(STATUS.WRONG_PARMS);
let dicHero = gameData.hero.get(pickHero);
@@ -262,7 +263,7 @@ export class GachaHandler {
let heroes: number[] = [];
if (gachaId == GACHA_ID.TIMELIMIT) {
let activityData = await ActivityModel.findActivity(activityId, true);
let activityData = await ActivityModel.findActivity(serverId, activityId, true);
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(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
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(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new SelfServiceShopData(activityData);
let item = playerData.getItem(index);

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

@@ -55,7 +55,7 @@ export class ThirtyDaysHandler {
let todayIndex = await playerThirtyDaysActivityDays(roleId);//玩家当前的天数
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(ACTIVITY_TYPE.THIRTY_DAYS, true)
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS, true)
activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId
});