diff --git a/game-server/app/services/guildBossService.ts b/game-server/app/services/guildBossService.ts index dfb14a3e3..d259aebfb 100644 --- a/game-server/app/services/guildBossService.ts +++ b/game-server/app/services/guildBossService.ts @@ -13,6 +13,7 @@ import { GUILD_BOSS_STATUS } from '../consts/constModules/guildConst'; import { genAuction } from './auctionService'; import { GuildModel, GuildType } from '../db/Guild'; import { UserGuildModel, UserGuildType } from '../db/UserGuild'; +import { nowSeconds } from '../pubUtils/timeUtil'; /** * 获得boss界面 @@ -89,9 +90,10 @@ export async function getLastBossInstance(bossInstance: BossInstanceType, guildC if(lastBossInstance) { if(lastBossInstance.roleIdRecords.indexOf(roleId) == -1) { await BossInstanceModel.recordRoleIdWhenCheck(lastBossInstance.code, roleId); - return { status: GUILD_BOSS_STATUS.CLEAR, showParam: { winWarId: lastBossInstance.warId, winBossLv: lastBossInstance.bossLv } } + let { warId } = lastBossInstance; + return { status: GUILD_BOSS_STATUS.CLEAR, showParam: { winWarId: lastBossInstance.warId, winBossLv: lastBossInstance.bossLv }, warId } } else { - return { status: GUILD_BOSS_STATUS.CLEAR } + return { status: GUILD_BOSS_STATUS.WAIT_OPEN } } } else { return { status: GUILD_BOSS_STATUS.WAIT_OPEN } @@ -126,7 +128,7 @@ export async function checkBossResult(bossCode: string, guildCode: string, serve res.releaseCallback();//解锁 return true; } - await BossInstanceModel.updateBossInstance(bossCode, { bossHp: 0, status: GUILD_BOSS_STATUS.CLEAR, ranks, roleIdRecords:[roleId]}, ); + await BossInstanceModel.updateBossInstance(bossCode, { bossHp: 0, status: GUILD_BOSS_STATUS.CLEAR, ranks, roleIdRecords:[roleId], killTime: nowSeconds()}, ); await pushBossHpMessage(guildCode, serverId, 0, true); res.releaseCallback();//数据修改解锁 // 击杀奖励&伤害奖励 diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts index 293a3233a..683f76db2 100644 --- a/shared/consts/statusCode.ts +++ b/shared/consts/statusCode.ts @@ -177,7 +177,7 @@ export const STATUS = { NOT_WISH_THE_QUALITY_GOODS: { code: 20931, simStr: '不能够许愿该品质的物品' }, GUILD_PAY_CONDITION: { code: 20932, simStr: '充值金额不足' }, - GUILD_SCRIPT_IS_OPENED_TODAY: { code: 20950, simStr: '今日演武场已开启' }, + GUILD_SCRIPT_IS_OPENED_TODAY: { code: 20950, simStr: '今日已开启过演武场' }, GUILD_SCRIPT_NOT_OPENED: { code: 20951, simStr: '演武场未开启' }, GUILD_SCRIPT_IS_BATTLED: { code: 20952, simStr: '今日已挑战过演武场' }, GUILD_SCRIPT_IS_COMPLETE: { code: 20953, simStr: '演武场已挑战完成' },