From 1dee1a73b47bc4227faf158e58af987e4a1a8f89 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 28 Dec 2021 18:31:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=93=E5=85=B7=EF=BC=9A=E4=BD=93=E5=8A=9B?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=81=93=E5=85=B7=E4=B8=8A=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/role/handler/itemHandler.ts | 7 ++++++- game-server/app/services/chatService.ts | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/game-server/app/servers/role/handler/itemHandler.ts b/game-server/app/servers/role/handler/itemHandler.ts index 646a84eca..d1855a9a2 100644 --- a/game-server/app/servers/role/handler/itemHandler.ts +++ b/game-server/app/servers/role/handler/itemHandler.ts @@ -13,6 +13,7 @@ import { ActionPointModel } from "../../../db/ActionPoint"; import { GiftCodeDetailModel } from "../../../db/GiftCodeDetail"; import { GiftCodeType, GiftCodeModel } from "../../../db/GiftCode"; import { nowSeconds } from "../../../pubUtils/timeUtil"; +import { AP } from "../../../pubUtils/dicParam"; export default function (app: Application) { new HandlerService(app, {}); @@ -79,9 +80,13 @@ export class ItemHandler { } let role = await RoleModel.findByRoleId(roleId, 'lv'); - let { isOver } = await getAp(roleId, ip, role.lv); + let { ap, isOver } = await getAp(roleId, ip, role.lv); if (isOver) return resResult(STATUS.AP_IS_FULL); + if(ap + dicGoods.value * count > AP.AP_SAVE_MAX) { + return resResult(STATUS.AP_IS_FULL); + } + let consumeResult = await handleCost(roleId, sid, [{ id: id, count: count }], ITEM_CHANGE_REASON.USE_MEAT); if (!consumeResult) return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH); diff --git a/game-server/app/services/chatService.ts b/game-server/app/services/chatService.ts index 3737f13b1..c41b0ebad 100644 --- a/game-server/app/services/chatService.ts +++ b/game-server/app/services/chatService.ts @@ -295,7 +295,7 @@ export async function recentPrivateChatInfos(roleId: string, roleName: string) { } }) .splice(CHAT_SYSTEM.RECENT_PRIVATE_CHATS_CNT); - if (!recentPrivateChats || !recentPrivateChats.length) return null; + if (!recentPrivateChats || !recentPrivateChats.length) return []; const roleInfos = await RoleModel.findByRoleIds(recentPrivateChats.map(chat => { return chat.targetRoleId })); const chatInfos = recentPrivateChats.map( chat => {