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

后台：军团活动debug接口修复

Browse Source
This commit is contained in:
luying
2022-06-24 10:35:13 +08:00
parent 966618b816
commit 6e738d62b7
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
game-server/app/servers/gm/handler/gmHandler.ts
View File

@@ -312,6 +312,7 @@ export class GmHandler {
await pinus.app.rpc.systimer.systimerRemote.setDay.broadcast(day);
await pinus.app.rpc.connector.connectorRemote.setDay.broadcast(day);
await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.broadcast(aid);
await pinus.app.rpc.guild.guildActivityRemote.clearActivityObj.broadcast();
// 清空旧数据
if (day <= 2) {
@@ -361,6 +362,8 @@ export class GmHandler {
// 开启定时器
await pinus.app.rpc.systimer.systimerRemote.setAuctionSchedule.broadcast();
await pinus.app.rpc.systimer.systimerRemote.setGuildActivitySchedule.broadcast();
await pinus.app.rpc.guild.guildActivityRemote.clearActivityObj.broadcast();
// 向客户端发送时间
pinus.app.rpc.guild.guildActivityRemote.setCurrentTime.broadcast(now.getTime());
await pushCurrentTime(now.getTime());

1
game-server/app/services/guildActivity/guildActivityService.ts
View File

@@ -306,7 +306,6 @@ export async function settleGuildActivityReward(aid: number) {
let obj = getCityActivityObj();
let { cities } = obj.getAllCities();
for (let { serverId, cityId } of cities) {
console.log('######', serverId, cityId)
await cityActivitySettleReward(cityId, serverId);
}
} else if (aid == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {

6
game-server/app/services/rankService.ts
View File

@@ -252,18 +252,21 @@ export class Rank {
if (infoKey == REDIS_KEY.USER_INFO) {
if (!role) {
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let param = new RankParam(role);
await this.setUserInfo(infoKey, { roleId }, param);
} else if (infoKey == REDIS_KEY.GUILD_INFO) {
if (!guild) {
guild = await GuildModel.findByCode(guildCode, this.keyName.serverId, GUILD_SELECT.RANK)
if(!guild) return;
}
let param = new GuildRankParam(guild);
await this.setUserInfo(infoKey, { guildCode }, param);
} else if (infoKey == REDIS_KEY.TOP_LINEUP_INFO) {
if (!role) {
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let { topLineup = [] } = role;
let heroes = await HeroModel.findByRole(roleId, [], HERO_SELECT.RANK_LINEUP);
@@ -279,6 +282,7 @@ export class Rank {
} else if (infoKey == REDIS_KEY.HERO_INFO) {
if (!hero) {
hero = await HeroModel.findByHidAndRole(hid, roleId, HERO_SELECT.RANK_LINEUP, true);
if(!hero) return;
}
let arr = new Array<LineupParam>();
if (hero) {
@@ -289,6 +293,7 @@ export class Rank {
} else if (infoKey == REDIS_KEY.DUNGEON_LINEUP) {
if (!role) {
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let { dungeonWarId, dungeonHeroes } = role;
if (dungeonWarId > 0) {
@@ -308,6 +313,7 @@ export class Rank {
} else if (infoKey == REDIS_KEY.SHOW_LINEUP) {
if (!role) {
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let { showLineup, topLineup = [] } = role;
let heroes = await HeroModel.findByRole(roleId, [], HERO_SELECT.RANK_LINEUP);