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

演武台：修复bug

Browse Source
This commit is contained in:
luying
2021-09-24 10:12:23 +08:00
parent c83542812c
commit f3c73ade66
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
game-server/app/servers/guild/handler/guildBossHandler.ts
View File

@@ -49,7 +49,7 @@ export class GuildHandler {
let res: any = await lockData(serverId, DATA_NAME.BOSS_SCRIPT, code);//加锁
if (!!res.err)
return resResult(STATUS.REDLOCK_ERR);
const guild = await GuildModel.findByCode(code, serverId, 'code lv structure refOpenBossTime, openBossCnt');
const guild = await GuildModel.findByCode(code, serverId, 'code lv structure refOpenBossTime openBossCnt');
if (!guild) {
res.releaseCallback();
return resResult(STATUS.GUILD_NOT_FOUND);
@@ -137,6 +137,7 @@ export class GuildHandler {
}
//记录伤害
let bossInstance = await BossInstanceModel.updateBossHp(bossCode, damage, roleId);
if(!bossInstance) return resResult(STATUS.GUILD_SCRIPT_NOT_OPENED);
await BattleRecordModel.incBossDamage(battleCode, damage, bossInstance?.bossHp);
if (!bossInstance || bossInstance.bossHp == 0) {//进入结算
let flag = await checkBossResult(bossCode, guildCode, serverId, DATA_NAME.BOSS_SCRIPT, roleId, damage);
@@ -214,8 +215,8 @@ export class GuildHandler {
encourageMax: dicBossBase.encourageSum,
myEncourageCnt: myEncourageCntResult
}
let chatSid = await getGuildChannelSid(code);
pinus.app.rpc.chat.guildRemote.pushEncourage.toServer(chatSid, code, result);
let chatSid = await getGuildChannelSid(userGuild.guildCode);
pinus.app.rpc.chat.guildRemote.pushEncourage.toServer(chatSid, userGuild.guildCode, result);
return resResult(STATUS.SUCCESS, result);
}

2
shared/consts/constModules/guildConst.ts
View File

@@ -162,7 +162,7 @@ export const GUILD_ROUTE_OPERATE = [
{ route: 'guild.raceActivityHandler.getRace', operate: GUILD_OPERATE.RACE_ACTIVITY, type: GUILD_AUTH_CHECK_TYPE.CHECK_SELF_WITH_SESSION },
{ route: 'guild.raceActivityHandler.useItem', operate: GUILD_OPERATE.RACE_ACTIVITY, type: GUILD_AUTH_CHECK_TYPE.CHECK_SELF_WITH_SESSION },
{ route: 'guild.raceActivityHandler.battleEnd', operate: GUILD_OPERATE.RACE_ACTIVITY, type: GUILD_AUTH_CHECK_TYPE.CHECK_SELF_WITH_SESSION },
{ route: 'guild.guildBossHandler.encou', operate: GUILD_OPERATE.BOSS_BATTLE, type: GUILD_AUTH_CHECK_TYPE.CHECK_SELF },
{ route: 'guild.guildBossHandler.encourage', operate: GUILD_OPERATE.BOSS_BATTLE, type: GUILD_AUTH_CHECK_TYPE.CHECK_SELF },
];

4
shared/consts/constModules/sysConst.ts
View File

@@ -379,6 +379,7 @@ export const FILENAME = {
DIC_GK_TOWER: 'dic_zyz_gk_tower',
DIC_GK_TREASURE: 'dic_zyz_gk_Treasure',
DIC_GK_ARMY_TRAIN: 'dic_zyz_gk_armytrain',
DIC_GK_ARMY_BOSS: 'dic_zyz_gk_armyboss',
DIC_HERO: 'dic_zyz_hero',
DIC_HERO_QUALITY_UP: 'dic_zyz_hero_quality_up',
DIC_HERO_STAR: 'dic_zyz_hero_star',
@@ -490,7 +491,8 @@ export const WAR_RELATE_TABLES = [
FILENAME.DIC_GK_FES,
FILENAME.DIC_GK_NEWHERO,
FILENAME.DIC_GK_PROBATION,
FILENAME.DIC_GK_ARMY_TRAIN
FILENAME.DIC_GK_ARMY_TRAIN,
FILENAME.DIC_GK_ARMY_BOSS
]
// 装备栏强化类型

4
shared/db/Guild.ts
View File

@@ -198,7 +198,9 @@ export default class Guild extends BaseModel {
}
public static async updateInfo(code: string, update: GuildUpdateParam, incParam?: { managerCnt?: number, fund?: number, activeDaily?: number, activeWeekly?: number }, select?: string) {
const result: GuildType = await GuildModel.findOneAndUpdate({ code }, { $set: update, $inc: incParam }, { new: true }).select(select).lean();
let param = { $set: update };
if(incParam) param['$inc'] = incParam;
const result: GuildType = await GuildModel.findOneAndUpdate({ code }, param, { new: true }).select(select).lean();
return result;
}